Commit Graph

2954 Commits

Author SHA1 Message Date
Alex 54ac7f0914 Merge pull request #3873 from Ikarrus/boxpolishjune2014
Map Update 8/6/14
2014-06-11 12:15:36 +01:00
Kelenius 3908160998 One big update for stacks. 2014-06-10 20:36:08 +04:00
Cheridan 4facf4aa47 Update cigs_lighters.dm
burnt matches get weak again
2014-06-09 21:30:57 -05:00
Cheridan ea7ab93e21 Update boxes.dm
Removes necessary check from matchbox attackby.
2014-06-09 20:00:38 -05:00
Cheridan b5b5735631 Refactoring of match code, makes it a little neater
Refactoring of rolling paper packs to a storage item.

Improves Rolling Paper and Packs sprites.
Cigarettes/Matches can be lit by fires now.
2014-06-09 19:56:25 -05:00
MrPerson 59d64656c4 Some fixes and minor improvements to examining. 2014-06-09 11:35:29 -07:00
MrPerson 645ca7f8a1 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
Conflicts:
	code/_onclick/click.dm
	code/game/atoms.dm
	code/game/objects/items/toys.dm
	code/modules/paperwork/folders.dm
	code/modules/power/cable.dm
2014-06-09 01:50:44 -07:00
ikarrus 98abad6481 Map Update 8/6/14
-Added windows to garden and Syndicate base
-Renamed brig lockdown button to something more appropriate
-Added subtle outlines for shuttle docking areas
-Moved the HoP line flasher back to make it harder to steal the flash inside during the initial rush
-Added teleporter beacon to the old AI sat teleporter
-Moved prison newscaster
-Made N2O storage more visible for security
-Removed extraneous light in the execution room
-Added Quarantine to AI upload
-Captain now spawns with a box of spare silver IDs instead of regular ones
-A few minor piping/wiring improvements
2014-06-08 19:26:37 -06:00
Malkevin b4ee133336 spaces 2014-06-08 01:00:51 +01:00
Malkevin 67fdbfbaaf Funfact: pickweight doesn't like numbers unless they're in a string. 2014-06-07 21:42:27 +01:00
Malkevin 6aa15e7337 Changed IEDs into firebombs.
Changed IEDs into firebombs to curtail the amount of station damage done whilst keeping IEDs useful and still keeping fuel tank bombs a useful saboteur's tool.

Their fuse time is a bit more variable too, including a 1 in 10 chance of them going off practically straight away (note: this is counter-able by the user wearing a fire-suit, git gud and l2p)
2014-06-07 03:18:21 +01:00
Rockdtben 569d12facf Moved item_heal_robotic out of obj/item and into mob_helpers.dm 2014-06-05 19:25:08 -05:00
Alex d0db8fdbed Merge pull request #3832 from phil235/StunprodFix
Stunprod Fix
2014-06-05 21:40:45 +01:00
ikarrus 40800b79e0 The Loggening: Admin Edition
-Build mode logging. A lot of its functions are highly abusable but not logged
-Gravity Catapults no longer spam asay. They will be kept in the game log.
-Logging for Cyborg handcuffs
-Logging for Stripping/equipping
-Logging for decreasing PA power control. Easier as an admin to tell when I should panic without having to watch them like a hawk.
-Logging for disposaling people
-Some code optimizations along the way as well
2014-06-02 23:13:33 -06:00
phil235 dca72dc916 Fix Tachyon detector and TTV not being deleted if inside something 2014-06-02 20:25:06 +02:00
phil235 40fbe585ba Warning message replaced by sparks sound 2014-06-02 01:42:50 +02:00
phil235 2be11ab55e Fix 2014-06-02 01:01:16 +02:00
phil235 8c6cd7b28f Stunprod Fix
* Fix icon not updating when turning off baton/stunprod with a total cell charge below the hitcost.
* Baton/stunprod no longer accepts cell with capacity below the hitcost(charge used per stun).
* Removes being able to give one last hit (that doesn't even deduct any charge) when the cell charge gets below the hitcost.
* Adds warning message when baton/stunprod turns off from being out of charge.
2014-06-02 00:42:23 +02:00
Miauw62 44f769208c Merge pull request #3804 from Cheridan/roboShlock
Fixes Robocop board not working
2014-06-01 12:16:16 +02:00
Miauw62 cc7760c628 Merge pull request #3750 from hornygranny/tablethisfornow
fixes #3746 fixes #3706
2014-05-28 18:58:11 +02:00
Cheridan 5aa17924b3 Fixes Robocop board not working 2014-05-27 15:59:10 -05:00
Hornygranny af2e792036 2oop4u 2014-05-27 12:07:53 -07:00
Hornygranny 6b7d3f49a9 muh OOP 2014-05-27 10:40:15 -07:00
Miauw62 21fdd8d7e4 Merge pull request #3723 from Ikarrus/monkeyimplants
Monkeys can be loyalty implanted
2014-05-24 19:51:46 +02:00
Cheridan 6bf97eb280 Merge pull request #3774 from Rolan7/Issue_1063
Fixes dodgeballs
2014-05-22 16:00:55 -05:00
Cheridan 18ebcc0e45 Merge pull request #3720 from hornygranny/readingrainbow
carved books now turn into storage items
2014-05-21 22:16:45 -05:00
Rolan7 e89a07dcf4 Dodgeballs now call the super code so they can be caught, theoretically deal real impact damage, and they actually give messages on hit. Fixes #1063, and makes dodgeball not so eerily quiet. Also fixes "too large to fit in this the backpack" in storage.dm. 2014-05-21 14:37:55 -04:00
Hornygranny 3e4a6128a1 colons removed, thanks RR 2014-05-20 10:28:13 -07:00
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
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
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
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
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
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
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
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
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