Commit Graph

29332 Commits

Author SHA1 Message Date
Purpose
b28527f992 Merge branch 'master' into dirt-smoothing 2018-10-07 17:16:54 +01:00
variableundefined
988beeb462 Merge pull request #9730 from SamHPurp/decal-tidy-up
Refactors decals
2018-10-07 23:09:05 +08:00
variableundefined
7a93f3fa77 Merge pull request #9709 from SamHPurp/discord-msg
Announces the Station name, fixes the hashes...
2018-10-07 22:53:03 +08:00
variableundefined
3c98bf5799 Merge pull request #9710 from SamHPurp/de-specifying
Reduces incorrect use of station names.
2018-10-07 22:52:27 +08:00
Purpose
eeed299b86 tidyup 2018-10-07 12:43:37 +01:00
Purpose
05a472756b cheaters 2018-10-07 10:38:07 +01:00
variableundefined
be0f003b0f Merge pull request #9725 from SkeletalElite/Holopara
Fixes Chaos Holoparasite
2018-10-07 16:33:36 +08:00
SkeletalElite
928b32ae22 Requested Changes 2018-10-07 01:26:45 -07:00
variableundefined
46b00ac8bc Merge pull request #9461 from Birdtalon/bugs
Reduces metal return for ammo boxes
2018-10-07 15:30:37 +08:00
variableundefined
98c2a5fef2 Merge pull request #9672 from datlo/clinggreyfix
Fix grey changelings keeping their wingdings
2018-10-07 15:29:43 +08:00
variableundefined
8d4551a2cd Merge pull request #9678 from farie82/fix-free-gene-stability
The cure procs for the disabilities now cure the gene as well
2018-10-07 15:28:16 +08:00
variableundefined
6ec4f05f38 Merge pull request #9694 from farie82/Disposals-move-fix
Fixes bluespace disposal bins and broken disposals due to the instant recall spell and meteor shot
2018-10-07 15:27:23 +08:00
SkeletalElite
e64ee06ad2 Fixes Chaos Holoparasite
It's described on hit Abilities actually work now
2018-10-06 16:51:05 -07:00
tigercat2000
d4d340ddf8 Merge pull request #9721 from SamHPurp/damnit-chairs
Fixes incorrect chair assignment
2018-10-06 16:50:21 -07:00
SkeletalElite
9912529ab7 Grammar Fix
"a meat spike" resulted in weird stuff like "a meat spike is hit by the laser!"
2018-10-06 15:39:04 -07:00
Purpose
50c393f78a missed a chair declaration 2018-10-06 22:53:34 +01:00
Purpose
b9d2f0a915 Revert this commit when using subsystem. 2018-10-06 21:54:38 +01:00
Purpose
a472eee850 dirt smoothing 2018-10-06 19:22:20 +01:00
Purpose
3b50aad95d oh lets not pick up wheelchairs either 2018-10-06 16:47:06 +01:00
Purpose
63dfd411aa Resolved merge conflicts... I hope. 2018-10-06 16:01:34 +01:00
Squirgenheimer
d90e5f1458 removes victims of swap forms and mindswap from nonrespawnable list 2018-10-05 22:11:16 -04:00
Purpose
4e22a2d907 naked syndicates are useless syndicates 2018-10-05 23:13:19 +01:00
Purpose
ea74920535 no no no no cyberiaaaaad 2018-10-05 20:57:41 +01:00
Purpose
7545060b5d Station name and no hashes 2018-10-05 17:36:28 +01:00
tigercat2000
947f8dbc3b Merge pull request #9700 from SamHPurp/yellow-closets
Fixes yellow closet icon reference
2018-10-04 15:16:00 -07:00
tigercat2000
5b64040644 Merge pull request #9701 from SamHPurp/damaged-plating
Fixes damaged plating not being visually fixed after welding
2018-10-04 15:12:29 -07:00
Purpose
f837f28115 Oh whoops 2018-10-04 14:49:24 +01:00
variableundefined
b441cde05b Merge pull request #9663 from lass9030/sensory-fix
Sensory Restoration symptom fix
2018-10-04 21:34:32 +08:00
Purpose
9d2c4d1438 boring fix 2018-10-04 14:15:34 +01:00
joep van der velden
c8e7625978 Removed the comment 2018-10-03 22:45:13 +02:00
joep van der velden
1eab4397c0 Fixes it 2018-10-03 22:42:00 +02:00
joep van der velden
990e11c1b6 Fixed it + handled the moving of disposal units 2018-10-03 22:01:49 +02:00
tigercat2000
b052cbf67f Merge pull request #9676 from farie82/fix-inventory-surgery
Fixed the inventory bug
2018-10-03 12:40:45 -07:00
farie82
a837688563 Update status_procs.dm 2018-10-03 09:52:51 +02:00
farie82
2f45f10c69 Update OpTable.dm 2018-10-03 09:48:59 +02:00
Aurorablade
ce3ecee145 Port of TG ghost role spawner and Corpse Landmark refactor (#8211)
Port of TG ghost role spawner and Corpse Landmark refactor
2018-10-03 11:31:55 +08:00
joep van der velden
6e1a7ddd55 The cure procs for the disabilities now cure the gene as well 2018-10-02 23:06:38 +02:00
joep van der velden
c39207001f Fixed the inventory bug 2018-10-02 21:17:31 +02:00
lass9030
c1dfa0aacf Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into sensory-fix 2018-10-02 18:42:47 +02:00
datlo
03f8cf0d29 Fix grey changelings keeping their wingdings
Changelings with wingdings now permanently switch to regular speech
after transforming
2018-10-02 16:55:04 +01:00
Birdtalon
44e448bc2b formatting error fix 2018-10-02 12:17:51 +01:00
lass9030
1196685036 Removed a derp (/mob/living/M -> mob/living/M) 2018-10-02 11:57:53 +02:00
lass9030
ef89d913d2 TDSSS's and variableundefined's comments adressed. 2018-10-02 11:48:07 +02:00
lass9030
12edbc2c76 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into sensory-fix 2018-10-02 11:47:12 +02:00
variableundefined
dc5f4faaee Merge pull request #9393 from Tails2091/TempClaw
Claw Game Refactor
2018-10-02 13:33:54 +08:00
variableundefined
09467dc3e0 Merge pull request #7770 from SamHPurp/motherfucking-delta-station
Ports Delta Station
2018-10-02 08:30:29 +08:00
Birdtalon
04ebe67db7 materials now scale to contents 2018-10-01 22:38:11 +01:00
lass9030
38e405ce76 Remade, now uses a proc, much help from Zix 2018-10-01 22:35:39 +02:00
lass9030
cd7b38f21b Fixed some human errors 2018-10-01 18:48:02 +02:00
lass9030
3b9c504192 woops 2018-10-01 18:35:57 +02:00