Commit Graph

5474 Commits

Author SHA1 Message Date
Cheridan 61d5425c3f Merge pull request #10503 from phil235/RevolverMisfireFix
Fixes for lighter, heart attack, defib, light fixture and other stuff
2015-07-11 19:01:04 -05:00
Cheridan 68c32438bb Merge pull request #10525 from phil235/FixFix1
Some fixes and stuff....
2015-07-11 18:06:29 -05:00
phil235 f580ad3863 Merge pull request #10492 from Miauw62/recorders
fixes tape recorder spans.
2015-07-10 22:57:42 +02:00
phil235 7307079f8b Fixes stripping an item from someone not checking if the item is still there after the delay.
Same fix for pocket picking and removing embedded item.
Adding a warning message when trying to put an item on someone in the wrong slot.
Fixes loyalty implant message upon destruction being sent to wrong/dead people.
Fire on mob will now slowly be consumed (no more forever on fire corpse).
Some work on fire related proc.
Can't lit a mob on fire with a lighter that isn't lit.
Removing duplicate code in species.dm.
You can no longer heal your burns by ingesting clf3 and dousing yourself with water repeatedly.
simplified micro/macro explosive implant's timed explosion code.
2015-07-10 22:29:06 +02:00
xxalpha 4b5659cbf2 what the fuck was I thinking with this one
Negative layers
2015-07-10 19:58:50 +01:00
xxalpha 1746e86ed8 Merge remote-tracking branch 'upstream/master' into smoothballs 2015-07-10 19:19:43 +01:00
Remie Richards f7faf4d730 Merge pull request #10487 from MrStonedOne/attacklogcleanup
Attack logging tweaks/cleanup
2015-07-10 18:42:08 +01:00
phil235 53a7b37a94 Modified detective revolver isn't deleted anymore when it misfires.
Heart attack: Moved heart attack var (and changed related code accordingly) from carbon to human since non humans have no use for it. I also added some feedback message when you recover from a heart attack.
Added a click cooldown on touching a light fixture.
burning yourself with a lighter now burns only the arm holding the lighter.
Fixes incorrect message when defibbing heart attack patient.
2015-07-10 00:18:35 +02:00
xxalpha 942b4fd790 Fixed false walls incorrect icon update.
Enabled mineral false walls.
2015-07-09 17:17:24 +01:00
Miauw 38d543aee9 fixes tape recorder spans. maybe this wont cause exploits 2015-07-09 17:59:58 +02:00
Ikarrus db7cb79509 Resolved Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-07-09 08:51:39 -06:00
Jordie 4928617c2b Merge pull request #10334 from xxalpha/jetbutt
Added ability for items inside items to have action buttons.
2015-07-09 20:51:29 +10:00
Jordie 6f2da10dd2 Merge pull request #10461 from Iamgoofball/patch-96
Security Lockers now start with Security Helmets.
2015-07-09 20:45:56 +10:00
Jordie 1714a8ee10 Merge pull request #10447 from xxalpha/plasmafix
Fixed plasma not stacking.
2015-07-09 20:45:21 +10:00
MrStonedOne a262f9aac7 Attack logging tweaks
Removed the "feature" to have something log in an atom's vv attack log, but not the file attack log. all attack log items will go to the file as well as vv.

Replaced all hard coded src.name/name for attack log's object argument with an actual object (src) except where it made more sense not to.

All attack logging *should* happen AFTER damage is applied now.

Removed the confusing attack entry for when a changeling stings another changeling.

Tweaked how punch attack logs worked
2015-07-08 23:14:37 -07:00
xxalpha e0f2b93089 Merge remote-tracking branch 'upstream/master' into smoothballs
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-07-09 02:40:21 +01:00
xxalpha 18d8cedf9b Transformed the datum into isolated procs. 2015-07-09 02:38:30 +01:00
Cheridan 2c3c8d7ae3 Merge pull request #10455 from Ikarrus/cyborgobjectives
Borging Antagonists
2015-07-08 17:40:01 -05:00
Ikarrus 12eb6a06cd Squash and revert map change 2015-07-08 15:12:00 -06:00
Ikarrus 3f21a78ab7 Adds a Hugbox
You can hug it.
2015-07-08 10:30:21 -06:00
Swag McYolosteinen d826a19f81 Merge pull request #9934 from nukeop/rcd
Makes RCDs more useful
2015-07-08 16:03:31 +02:00
Ikarrus 4c4d1aaae4 Rewording 2015-07-07 20:37:07 -06:00
xxalpha 7dcf3623e5 Removed image instantiation for faster smoothing. 2015-07-08 02:17:16 +01:00
xxalpha e7a90863b7 Repath grass. 2015-07-08 02:06:14 +01:00
xxalpha ab1227625f Merge remote-tracking branch 'upstream/master' into smoothballs
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-07-08 00:43:02 +01:00
Iamgoofball fe7defded4 Security Lockers now start with Security Helmets.
They have everything else, but no security helmets.

This made no sense.
2015-07-07 16:18:01 -07:00
xxalpha 5a5372ed96 Repathed carpet, and other shit I forgot. 2015-07-07 23:01:13 +01:00
xxalpha b74a65ff8a Working rwall decon icons, map editor iconstates, all smooth. 2015-07-07 22:17:25 +01:00
Ikarrus 3497744234 Makes it really obvious that antags no longer have objectives after being borged
Because people were confused by their memory being shown to them after the operation, which includes their objectives.
This also puts brains on a layer just above human mobs, so they can be seen when they pop out.
2015-07-07 15:11:53 -06:00
xxalpha 0b906c6916 All walls, fakewalls, windows, carpet. 2015-07-07 19:50:31 +01:00
xxalpha 49cb301318 Fixed plasma not stacking. 2015-07-07 17:38:23 +01:00
Cheridan 65484c6457 Merge pull request #10419 from Ikarrus/gangbadmin
Fixed Badmins being able to exceed the gang limit with excessive buttons
2015-07-07 08:57:30 -05:00
Ikarrus e67b18d93e - Fixed bug that prevented implant breakers from recruiting security.
- Gangs are reminded of imminent defeat/victory and the dominator's location when a timer drops below 3 minutes. (+3 squashed commit)

Squashed commit:

[49b614c] - Raised threshold of station damage before gang heads can no longer recall
- Implanters are now only blocked by helmets with THICKMATERIAL
- Changelog

[76f9662] Fixes runtime with gang messages sent to minds without mobs

[d81148e] Speeds up recruitment a bit (+1 squashed commits)

Squashed commits:

[d81148e] Speeds up recruitment a bit
2015-07-06 22:29:29 -06:00
xxalpha 8d96d87337 smoothed balls 2015-07-06 18:16:18 +01:00
WJohn 7ffd779b24 Merge pull request #10256 from AnturK/sword
Makes claymore back wearable
2015-07-06 11:44:56 -04:00
barackobama 58af0dd402 remove debug messages 2015-07-05 22:22:36 +01:00
xxalpha e56df69012 Restores ability to insert lighters into cigarette packs. 2015-07-05 00:44:39 +01:00
Cheridan 447d7651eb Merge pull request #10299 from xxalpha/runtimesrun
Fixed T-Scanners runtime error
2015-07-04 12:44:23 -05:00
Swag McYolosteinen a4b60449f8 Merge pull request #10129 from AnturK/ayy
Abductors fixes and improvements
2015-07-04 16:57:10 +02:00
Cheridan 7b6867bc21 Merge pull request #10328 from Ikarrus/datumgangs
Datum-Based Gangs [Ready]
2015-07-03 10:35:07 -05:00
xxalpha 8e8d9157d3 Fixed runtime with t_scanners.
Now it's fixed.
2015-07-03 12:16:22 +01:00
Ikarrus 3814dc208a Gang-Based Datums 2015-07-02 22:18:11 -06:00
MrStonedOne ed9238600e Revert "Fixes overexcited TTV reporting" 2015-07-02 16:34:22 -07:00
Cheridan b2ab5d84d1 Merge pull request #10309 from Ikarrus/holyshitsecbuffshutitdownikarrusisshit
Flashes and Flashers
2015-07-02 22:50:28 -05:00
Razharas 572121ecc4 Merge pull request #10244 from Ikarrus/workplacesafety
Workplace "Accidents"
2015-07-03 05:05:36 +03:00
Razharas d03006d17b Merge pull request #10304 from TheVekter/dogbedwoofwoof2
Replaces the crate in HoP's office with a dog bed
2015-07-03 04:27:48 +03:00
Ikarrus 24891ba762 Reduced aoe flashes to just one tick 2015-07-02 19:05:29 -06:00
xxalpha b563d5fbf4 Added ability for items inside items to have action buttons. 2015-07-03 00:33:02 +01:00
Ikarrus 25b134581b Resolved Conflicts:
code/game/gamemodes/gang/gang_pen.dm
2015-07-02 15:15:41 -06:00
Ikarrus 2191a2c33d Datum-Based Gangs 2015-07-02 15:12:55 -06:00