Commit Graph

4458 Commits

Author SHA1 Message Date
Hornygranny ec467852e7 missing " 2014-05-19 14:28:50 -07:00
Hornygranny 294e242c07 fixes #3746 fixes #3706 2014-05-19 14:23:43 -07:00
Rolan7 e88528771d Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue236_Trays
Conflicts:
	code/game/objects/items/weapons/kitchen.dm (Resolved, we were both removing snowflakey tray code)
2014-05-19 03:36:07 -04:00
Alex 50817435f0 Merge pull request #3721 from hornygranny/meltingsnow
Snowflake garbage removed
2014-05-19 07:15:24 +01:00
Rolan7 a36afba82a Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue236_Trays
Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm (The map was deleted)
	code/game/objects/items/weapons/kitchen.dm (Someone fixed up tray attack code a little, whereas I moved trays to a subclass of bags and made the attack code very simple by comparison.  Went with my solution.)
2014-05-18 20:50:38 -04:00
Kelenius 584a014a12 Hopefully last change 2014-05-18 22:46:32 +04:00
Kelenius a576cb7fea Part 2 2014-05-18 21:42:20 +04:00
Kelenius 1d4a6c5d26 Merge branch 'master' into slimes
Conflicts:
	code/modules/mob/living/carbon/metroid/metroid.dm
2014-05-18 21:38:25 +04:00
Kelenius ed5f8a0ee6 Fixes, part 1 2014-05-18 21:27:40 +04:00
ikarrus c7fc7f4811 Monkeys can be loyalty implanted
Monkeys can still be revs, so they should be able to be loyalty implanted. This would also fall in line with the other implants, which have no race restriction.

Fixes #637
2014-05-16 22:17:06 -06:00
Hornygranny 937170994d tray hit restored to glory 2014-05-16 16:36:53 -07:00
Hornygranny 10b4e9e138 Snowflake garbage removed 2014-05-16 15:22:37 -07:00
Alex 1bf05c4406 Merge pull request #3679 from CollenN/modulesprites
Adds Electric Arm Sprite
2014-05-16 22:57:50 +01:00
Hornygranny 2552946fd5 forgot to include the fucking book itself 2014-05-16 14:43:19 -07:00
Hornygranny d0015287de carved books now turn into storage items 2014-05-16 14:30:04 -07:00
Alex 89017d08b5 Merge pull request #3698 from Deantwo/Grenade-Name
Fixed grenade casing name not changing
2014-05-15 13:57:38 +01:00
Deantwo 81509c0c66 Ups fixes 2014-05-14 18:40:33 +02:00
Deantwo a8cab7e396 String building and stage_change method
-
2014-05-14 17:11:35 +02:00
ikarrus 8496ec8dd1 Should be auto-mergable again 2014-05-14 08:57:52 -06:00
Deantwo 9e2f0f0fda Fixed grenade casing not being renamed to grenade when complete
Fixed grenade casing not being renamed to grenade when complete and made
all assembly messages refer to the assembly as "grenade assembly".

- The grenade assembly is called "grenade casing" before anything is
done (like it always was)
- The grenade assembly is called "unsecured grenade" when a activation
mechanism is added (like before

https://github.com/tgstation/-tg-station/commit/f645037dd5ffe491c94f73a39b3aac312e51d579)
- The grenade assembly is called "grenade" when finished (like before

https://github.com/tgstation/-tg-station/commit/f645037dd5ffe491c94f73a39b3aac312e51d579)
- Renamed large chem grenade to "large grenade casing"
- Made using a wrench on a unsecured grenade remove the payload on the
first use, and the activation mechanism on the second use (because we
don't want to always remove both at the same time)
- Made cable_coil drop on the floor if it was used as activation
mechanism

Fixes https://github.com/tgstation/-tg-station/issues/2378
2014-05-14 16:09:12 +02:00
Alex 0d531eacf6 Merge pull request #3543 from paprka/stechupdate
Adds Stechkin pistol and Bond bundle to traitor uplink
2014-05-14 10:51:46 +01:00
Alex 0eb1af3331 Merge pull request #3659 from AnturK/stuffz
Fixes one-way locks
2014-05-14 09:58:05 +01:00
Alex 66feb77503 Merge pull request #3677 from Kelenius/dualsaberfix
Fix for #2660: clowns killing themselves with toy dualsabers
2014-05-14 09:27:37 +01:00
Alex 6686b2ec7c Merge pull request #3687 from Jordie0608/removerelativepathsfromtheeverythingplz
Fixes #3681: suicide messages when crit
2014-05-14 09:24:29 +01:00
CollenN 2aefeb0b81 Sechud uses right icon 2014-05-12 16:35:30 -04:00
Jordie0608 5b94391e6f Unidentinization^2 2014-05-13 02:25:14 +10:00
Jordie0608 4078973a5c Unidentinization 2014-05-13 02:18:21 +10:00
Jordie0608 dfd2cc4b60 Changed suicide messages to visible_messages and fixed relative pathing 2014-05-13 01:44:29 +10:00
Kelenius 07b90d21bd Yes. Lowercase. How could I forget. 2014-05-11 23:33:46 +04:00
CollenN 00d9bc8098 Robot Item Sprites
Adds a file called robot_items.dmi. Did some minor tweaks to the borg
goggle/hudglasses sprites to make them look slightly mechanical, and
added a sprite for the electric arm, which is animated, replacing the
old warning triangle sign.
2014-05-11 13:25:27 -04:00
Kelenius a76d067b3a Attempt two 2014-05-11 00:45:59 +04:00
Kelenius 63a9c5b5af Fixed hurting yourself with toy double esword while clumsy 2014-05-10 19:47:29 +04:00
ikarrus b3d1e87b1f Merge branch 'master' of https://github.com/tgstation/-tg-station into documents 2014-05-08 20:18:57 -06:00
Rolan7 f2493b4c37 Makes trays a subclass of bag.
This somewhat changes how items are placed on them, but for the better as it's more consistent with existing mechanics.
Hitting someone with the tray still scatters the contents around!  Works on nonhumans.
Placing icons on the tray still makes them show up on the tray.  Using the tray on a table now places the items onto the table, or places the tray itself if it's empty.  Robots can't lose their tray this way, I checked.
Service borgs can actually use their tray to carry things!  Trays can hold all sorts of stuff, as long as it's small...
A service borg can carry the nuke disk around.  The pinpointer does follow it correctly.
If the service borg stashes its tray module, dies, explodes, gibselfs, or is forced to stash its modules by damage, it drops all the tray's contents on the ground.

Fixes #236 (service borgs can't use trays) and #2991 (Items on food trays can't be picked up).  Didn't address #1919, the layer issue.

Fixes the "bajillion lines changed" with the maps.
2014-05-07 13:04:22 -04:00
Miauw62 a0279416f1 Merge pull request #3647 from Jordie0608/msoisatheifhalthalthalthalt
Changed mining equipment locker to mining equipment vendor
2014-05-07 17:25:22 +02:00
AnturK 03c183bb7d Fixes one-way locks 2014-05-07 11:33:56 +02:00
Alex 5d39b2f5c2 Merge pull request #3524 from phil235/ShardFeetFix
Fix for stepping on shard
2014-05-06 20:01:10 +01:00
Jordie0608 6530150120 Changed mining equipment locker to mining equipment vendor 2014-05-06 20:01:01 +10:00
Razharas 282a5d3a2b Merge pull request #3379 from Cheridan/sliceofpai
Refactors pAI law code...
2014-05-05 07:33:17 -07:00
ikarrus 58b2ff1671 -Removed some duplicate code
-Made the syndicate document names appear like codenames
2014-05-04 16:18:48 -06:00
ikarrus 82639d14a6 Secret Document Objectives
Adds new steal objective "Secret Documents"
-A set of secret documents spawn in the vault's filing cabinet, but even syndicate documents qualify as valid steals

Adds the exchange objective for traitors
-If there are at least 6 traitors, two of them will be selected to make an exchange of secret documents
-There is a low (20%) chance that one of them will have an additional backstab objective, where they will require both sets of documents to win
2014-05-04 15:00:47 -06:00
Miauw62 5e6d59d95f Merge pull request #3605 from phil235/DualsaberSoundFix
Fixes the lack of hitsounds for the dualsaber.
2014-05-03 16:30:09 +02:00
Alex 09f112c9cb Merge pull request #3572 from Aranclanos/evidencebags
Heil myself
2014-05-02 17:46:04 +01:00
Alex 64073f0a8d Merge pull request #3489 from Aranclanos/ChemGrenades
Chem grenades asay logs improvements
2014-05-02 17:45:11 +01:00
MrPerson 9d9a657acf Change examine() from an atom verb to a mob verb
Just in time for the feature freeze, a big change that will introduce bugs! Yay!
Mob verb is called verb/examinate(target), which just calls target.examine(user) and face_atom(target)
For explanation why, see http://www.byond.com/forum/?post=1326139&page=2#comment8198716
Long story short, mob verbs are much faster than object verbs. The goal is to make right-click menus populate faster.

Also changes a bunch of examine() procs to always, ALWAYS call the parent. Except mobs, but you have 1 guess why I'm not touching them. Mostly this affects obj/item/examine().
And also remove a whole shitload of pointless set src in view(2) kind of crap. Also span classes.
2014-05-01 09:56:39 -07:00
Kelenius 3f1574a475 Added slime scanner
Much less nutrition consumed, but they actually use it to grow
Made mutation chance random between 25 and 35
Slime core reactions use 1 unit of reagent
Code cleanups
2014-05-01 14:51:26 +04:00
phil235 19734b93cc Fixes the lack of hitsounds for the dualsaber. 2014-04-30 23:37:31 +02:00
Aranclanos 129401c403 evidence bags will now use attackby() to add items to themselves
removed the preattack() proc
2014-04-29 08:38:51 -03:00
paprka d8e6ac64a2 final 2014-04-26 16:31:07 -07:00
phil235 aa2c65aaf4 removing some of my code 2014-04-25 20:44:32 +02:00