Commit Graph

17798 Commits

Author SHA1 Message Date
Steelpoint 60f05dc1ff AlienBox+AlienPaper 2015-07-15 15:05:01 +08:00
Steelpoint bbe7fd59e9 AlienStunBatonSprites 2015-07-15 12:04:00 +08:00
Steelpoint 8696e69518 Fix 2015-07-15 02:51:13 +08:00
Swag McYolosteinen 4878a7b8d5 Merge pull request #10531 from duncathan/rpddelay
Speeds up RPD and pipe unwrenching
2015-07-12 12:41:49 +02:00
Swag McYolosteinen 81ec442d50 Merge pull request #10512 from duncathan/traygoggles
Adds t-ray scanner goggles for atmos techs
2015-07-12 12:41:37 +02:00
Cheridan 5934522224 Merge pull request #10541 from MrStonedOne/ohdwait
More Dynamic wait tweaks.
2015-07-11 20:52:23 -05:00
Cheridan a0a20b0b0a Merge pull request #10484 from Ikarrus/augmaintenance
Makes augmentations more difficult to maintain
2015-07-11 19:54:58 -05:00
WJohn 4be10fcce5 Merge pull request #10529 from xxalpha/smoothballs
Fixed gases deleting all overlays of a turf when spreading.
2015-07-11 20:27:22 -04:00
WJohn dee7423b00 Merge pull request #10480 from Chiefwaffles/CELLS_ARE_HARD
Change w_class of Power Cells from 3.0 to 2
2015-07-11 20:25:14 -04:00
Cheridan 7a02c71099 Merge pull request #10475 from phil235/BundleTypoFix
Fixes a typo in the traitor bundle's description.
2015-07-11 19:24:31 -05:00
WJohn 9b5badfd4b Merge pull request #10495 from Iamgoofball/patch-98
Due to recent shortages, justice helmets are more expensive
2015-07-11 20:22:43 -04:00
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 ab7fef8082 Merge pull request #10526 from phil235/ImprovisedShotgunFix
Fixes improvised shotgun being deleted when tablecrafted.
2015-07-11 18:57:13 -05:00
Cheridan 7dc3414da3 Merge pull request #10496 from MrStonedOne/WHYISTHISSOOLOUD
Helmet of Justice nerfs: Lowers the volume by ~40% and raises the cooldown by ~20%
2015-07-11 18:16:51 -05:00
Cheridan 68c32438bb Merge pull request #10525 from phil235/FixFix1
Some fixes and stuff....
2015-07-11 18:06:29 -05:00
Cheridan e0bbfbacc1 Merge pull request #10494 from phil235/CloggedScrubberFix
Fixes for clogged vent event and backpack preferences.
2015-07-11 09:19:25 -05:00
Iamgoofball 7244513382 i want to believe 2015-07-11 00:54:37 -07:00
Jordie 3ed7f9073f Merge pull request #10170 from Iamgoofball/patch-92
Nerfs the recycler.
2015-07-11 17:44:55 +10:00
Iamgoofball 3a8ce46b74 ugh sure 2015-07-11 00:31:44 -07:00
MrStonedOne 08b9f6c8c6 More Dynamic wait tweaks.
I forgot a step in the algo and made it so it was decreasing in its slowdown effect with more lag, not increasing.

I've also made the -1.5 magic number in the algo configurable. its was a simple buffer of cost the subsystem is allowed to use that isn't counted against it in dwait.
2015-07-10 23:25:34 -07:00
duncathan c3b095a8b3 adds scanners to R&D; adds changelog 2015-07-10 23:15:44 -06:00
xxalpha bd6ebcbd69 Fixed nest overlays being deleted when unbuckling a mob. 2015-07-11 02:20:50 +01:00
duncathan c870469a39 speeds up RPD and pipe unwrenching 2015-07-10 18:03:43 -06:00
xxalpha 15594439bc Fixed gases deleting all overlays of a turf when spreading.
Better code

SHIT
2015-07-11 00:18:33 +01:00
phil235 68c360e136 Fixes improvised gun being deleted when tablecrafted. 2015-07-10 23:45:38 +02: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
Remie Richards 6aa45ebca4 Merge pull request #10491 from xxalpha/smoothballs
Fixed false walls not updating their icon correctly.
2015-07-10 20:26:15 +01:00
xxalpha 4b5659cbf2 what the fuck was I thinking with this one
Negative layers
2015-07-10 19:58:50 +01:00
Remie Richards 648803f34d Merge pull request #10478 from Dorsisdwarf/uplinkplant
Lowers cost of Syndicate Encryption Key and Uplink Implant [balance]
2015-07-10 19:21:10 +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
Cheridan 1a66334c85 Merge pull request #10482 from Ikarrus/sameface
Adds False Armblade Sting / Nerfs Transformation Sting
2015-07-10 11:20:14 -05:00
duncathan 5bfaff9879 adds tray goggles 2015-07-10 03:35:56 -06:00
Ikarrus 0a19c7d1a2 Fake armblades are a subtype of real ones now, as requested by remies 2015-07-09 22:09:54 -06:00
Ikarrus d8e0908a2b Adds False Armblade Sting (+squashed commits) 2015-07-09 21:11:23 -06:00
Chiefwaffles 71a397b3bd Super Big Change
Removes ".0" from "2.0"
2015-07-09 19:07:05 -07: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
MrStonedOne 12580ec5da Fixes siren helmet spam
Volume has been greatly reduced, and the cooldown has been raised sightly to give short bursts of silence between sirens.
2015-07-09 12:25:56 -07:00
Iamgoofball e994f6c919 Due to recent shortages, justice helmets are more expensive
Space Justice Warriors have been attacking freighters carrying the Justice Helmets, and they have been in low supply recently, resulting in an increase of price for justice enforcer cfates. Reports from captured SJWs claim that the helmets offend them. Requests to ban the sale of justice helmets will be met with equally insulting responses.

- Nanotrasen Cargo Committee
2015-07-09 11:51:03 -07:00
phil235 e35c901af2 Fixes The clogged vent event making smoke spawn on welded scrubbers.
Removes the problematic preference option to spawn without backpack (just drop your backpack after you spawn).
2015-07-09 20:28:28 +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
Ikarrus 4086ee683d Revert EMP damage 2015-07-09 07:28:05 -06:00
Jordie 8bf129cc06 Merge pull request #10336 from AlexanderUlanH/riotshotguns
Rubber Shotgun Pellets
2015-07-09 20:56:25 +10: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 2fe69c3682 Merge pull request #10468 from AnturK/spellbookerrata
Spellbook fixes
2015-07-09 20:48:45 +10:00
Jordie f72cee2ad0 Merge pull request #10467 from MrStonedOne/patch-22
Makes log viewing use ftp() over run()
2015-07-09 20:46:17 +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