Commit Graph

20602 Commits

Author SHA1 Message Date
Rob Nelson
69f5b73d94 Merge pull request #6524 from ShiggyPiggy/bugfix-3197
Fixes issue #3197
2015-11-10 12:01:09 -08:00
Rob Nelson
7c41d9b4a5 Merge pull request #6526 from clusterfack/merch
Fixes #5305
2015-11-10 12:00:43 -08:00
Rob Nelson
d951f03bf2 Merge pull request #6528 from clusterfack/fixesinputs
Fixes #6453
2015-11-10 11:59:42 -08:00
Rob Nelson
c96c582b62 Merge pull request #6529 from dylanstrategie/Donuts
Fix donut boxes, fix fancy empty subtypes
2015-11-10 11:59:26 -08:00
Rob Nelson
db14406f48 Merge pull request #6530 from PJB3005/pipes-the-pipening
Fixes ventcrawling through layer manifolds sucking.
2015-11-10 11:59:07 -08:00
Rob Nelson
c999b0859f Merge pull request #6531 from clusterfack/holodeck
Fixes #6371
2015-11-10 11:58:38 -08:00
eswordthecat
f7fb8a75af Fix #6521. 2015-11-11 03:35:20 +08:00
clusterfack
0d8c18b906 Fixes #6371
GOD FUCKING DAMNIT THIS WAS CHANGETURF.

WHO THE FUCK WOULD REPLACE CHANGETURF WITH TURF/NEW?
2015-11-10 12:48:24 -06:00
PJB3005
ccf7014327 Fixes ventcrawling through layer manifolds sucking.
You now get aligned to the third layer, if neccesary.

Fixes #6470.
2015-11-10 19:07:07 +01:00
dylanstrategie
d3f5e344ae Missed one 2015-11-10 19:01:37 +01:00
dylanstrategie
eda8f3fb5c Fix donut boxes, fix fancy empty subtypes 2015-11-10 18:58:12 +01:00
clusterfack
0be7b7daa5 Fixes #6453
The procs return before irreparably breaking everything because they are handling a null input as though it were a real option
2015-11-10 11:24:02 -06:00
dylanstrategie
32e265a1a9 Requested fixes 2015-11-10 18:13:55 +01:00
clusterfack
2cf58c00a1 Fixes #5305
Merch computer has a corrected update icon
2015-11-10 10:43:44 -06:00
dylanstrategie
57ba60e80c Update bookcase code 2015-11-10 17:36:25 +01:00
ShiggyPiggy
05e707eeaf Fixes issue #3197
Yup, go away https://github.com/d3athrow/vgstation13/issues/3197
2015-11-10 21:41:28 +06:00
ShiggyPiggy
d1d22fd82b Some medical tweaks
The surgeon's switchtool now can be constructed at R&D with proper tech
levels and the CMO has maintenance access. (Revised to remove commit
madness)
2015-11-10 21:10:02 +06:00
clusterfack
275fcc4653 Fixes #4027
Only areas connected to a firedoor by a floor will be recongized as an area in which the firedoor exists.
i.e. A firedoor connected to a wall of another area will not trigger that firedoor
2015-11-10 09:02:12 -06:00
Probe1
5ad33c405c Adds research access to asteroid shuttle doors and corrects the spelling on a warning. 2015-11-10 07:16:50 -05:00
Probe1
ad2e079b06 Fixes https://github.com/d3athrow/vgstation13/issues/6444
Diddles the master trainer belt so it doesn't spawn beacons (../hivebot/tele) which spawn new mobs that won't be loyal to the miner.  Adds a blocked list so we  can easily go back and block or unblock new mobs.
2015-11-10 05:54:25 -05:00
clusterfack
dd77bbe5c2 Fixes #4325
Changelings drain all blood from their victim
Changeilngs replenish any blood they have lost from the draining of their victim
2015-11-10 03:25:47 -06:00
d3athrow
8077fff08c Merge pull request #6499 from Probe1/Bleeding-Edge
Fixes medical/security not having EVA access
2015-11-10 00:16:26 -06:00
Probe1
dda636f5a0 Gives medical and security jobs EVA access so they can get their hardsuits.
Adds magboots to the paramedics EVA locker
2015-11-10 00:57:36 -05:00
DeityLink
0d9a96d742 replicator and autocloner changes 2015-11-10 03:55:38 +01:00
eswordthecat
5d5c75e006 This kills, ## ERROR: Mine is an area and is trying to make the sound: sound/items/shovel.ogg 2015-11-10 09:13:15 +08:00
Rob Nelson
e6ac494287 Merge pull request #6506 from Wizardcrying/installjan2
Janicart round 2. Now with proper grammar!
2015-11-09 14:09:42 -08:00
Wizardcrying
ad1e516107 Janicart round 2. Now with proper grammar! 2015-11-09 14:03:28 -08:00
9600bauds
1456c23fec Fixes fork nonsense 2015-11-09 18:34:24 -03:00
9600bauds
5ede987387 Fixes #6442, re-allows grilling/frying customizable food, \improper a few names 2015-11-09 18:17:14 -03:00
clusterfack
ae0ed4e6dd Well that can happen too 2015-11-09 08:52:51 -06:00
clusterfack
3af331ef1d SUfficient Codervalids Detected
Fixes #6461
Fixes #6261
2015-11-09 06:56:44 -06:00
Wizardcrying
c610cb744e Comments out majormutate() being called by radiation 2015-11-09 00:57:18 -08:00
clusterfack
82da52e044 God fucking damnit dream maker don't undo shit 2015-11-08 21:43:44 -06:00
clusterfack
16d1118848 Fix infinite blood tracks 2015-11-08 21:15:04 -06:00
Rob Nelson
f64cfbe4fc Fixes #6454 2015-11-08 18:52:04 -08:00
eswordthecat
3b13223c1b Do the initial proc magic instead of newing things (suggestion by @RemieRichards). 2015-11-09 10:22:18 +08:00
Rob Nelson
d2f4397be4 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge 2015-11-08 16:40:09 -08:00
Rob Nelson
e605fb7359 Added screamer for testing language/saycode issues locally. 2015-11-08 16:39:39 -08:00
Rob Nelson
2bb8077a5c Merge pull request #6482 from DeityLink/gibshades
Improved some simple animal gibs
2015-11-08 13:26:41 -08:00
Rob Nelson
d1fc644243 Merge pull request #6483 from Duny-/Bleeding-Edge
Yet another defficiency update I'm doing for free when I could have w…
2015-11-08 13:26:30 -08:00
Rob Nelson
9d6ede682b Merge pull request #6484 from DeityLink/blendprints
There you go Clusterfack
2015-11-08 13:26:10 -08:00
Rob Nelson
f5262abbdc Merge pull request #6485 from Probe1/diona_fixes
Diona fixes
2015-11-08 13:25:48 -08:00
Rob Nelson
5bb1aa6c88 Merge pull request #6487 from eswordthecat/offload-update-nano
Remove a bunch of update_uis at nanomanager, it's already set as auto…
2015-11-08 13:24:48 -08:00
Rob Nelson
9e3a8cdaac Merge pull request #6488 from DeityLink/simpleplan
Fixing a typo
2015-11-08 13:24:39 -08:00
DeityLink
b9211b87f5 plane 2015-11-08 21:40:38 +01:00
eswordthecat
6c219f3be6 Remove a bunch of update_uis at nanomanager, it's already set as auto update. 2015-11-09 04:23:22 +08:00
eswordthecat
d3309bc976 Remove del and unnecessary assignments at rd console proc. 2015-11-09 02:43:24 +08:00
Probe1
044d106d5b closes https://github.com/d3athrow/vgstation13/issues/6429 by adding a check if diona is dead when trying to evolve and using drop_all proc 2015-11-08 13:17:54 -05:00
DeityLink
091bbcfb8c there you go Clusterfack 2015-11-08 18:28:49 +01:00
DeityLink
38abe31637 gibmeat 2015-11-08 18:12:47 +01:00