Matt Smith
c227ebefe8
Updated base object and fixed missing line.
2015-01-03 23:48:21 +00:00
Matt Smith
19ad927d4f
Fixing desc to show max cap of the RCD
...
Was hard coded to show 30, moving it to a variable and actually making use of it.
2015-01-03 16:48:43 +00:00
phil235
1153ef4700
Merge pull request #6651 from paprka/tablesandwindowsbaby
...
Fixes shuttle windows smoothing with normal windows
2015-01-03 00:22:29 +01:00
paprka
ad5872e84f
fixes window junction update to use initial icon state
2015-01-02 15:14:36 -08:00
tkdrg
ac57c7007b
Merge pull request #6723 from Boggart/airlockconstructionfix
...
Fixes being unable to build doors over firelocks, blast doors and shutters.
2015-01-02 04:16:17 -03:00
Boggart
0fd3f0d275
Improves fireaxe check for poddoors.
2015-01-01 23:15:01 -07:00
tkdrg
38acdca156
Merge pull request #6713 from phil235/DicerollRuntimeFix
...
Fixes runtime linked to diceroll proc
2015-01-01 16:58:39 -03:00
tkdrg
6a0f1be7cd
Merge pull request #6584 from phil235/HoloSwordFix
...
Fixes being able to smash grille/newscaster/mirror/lights with holo esword
2015-01-01 16:39:16 -03:00
Swag McYolosteinen
17c81726ce
Merge pull request #6722 from tkdrg/holytitsmergethis
...
[HOLY TITS MERGE THIS] Fixes Hulk server crash bug and also a couple typos
2015-01-01 13:41:35 +01:00
tkdrg
adc23dcd35
Merge pull request #6695 from Iamgoofball/raginmages
...
RAGIN' MAGES: Take 2: Working edition
2015-01-01 03:04:26 -03:00
Iamgoofball
56f2ec2721
>magin'
2014-12-31 21:58:21 -08:00
Iamgoofball
4b8bf0180e
Update raginmages.dm
2014-12-31 21:55:38 -08:00
Iamgoofball
2c118837ad
Update spellbook.dm
2014-12-31 21:30:27 -08:00
Boggart
ff17e083eb
Fixes being unable to build doors over firelocks, blast doors and shutters.
...
As a result, any door with the sub_door variable set to 1 can have an airlock built over it.
Also fixes using a fireaxe to open unpowered poddoors and adds myself to the admins.txt.
2014-12-31 20:47:17 -07:00
tkdrg
371b66a334
Merge pull request #6678 from paprka/nitrile
...
Adds nitrile gloves
2015-01-01 00:29:04 -03:00
tkdrg
908922f24c
Fixes Hulk crash bug and typos
2014-12-31 23:28:14 -03:00
tkdrg
9a9f0bc058
Merge pull request #6691 from Menshin/clientless_peeking_runtime_fix
...
Fixes runtime with moving objects in/out of storage while clientless mobs peeking
2014-12-31 22:19:38 -03:00
tkdrg
4e134df3fd
Merge pull request #6661 from Menshin/bend_pipes_atmos_fixes
...
Atmos pipes fixes and tweaks
2014-12-31 20:18:53 -03:00
tkdrg
cdb5066502
Merge pull request #6324 from Razharas/GenShit
...
Added datum mutations
2014-12-31 17:24:15 -03:00
phil235
57cf4bc394
Fixes runtime linked to diceroll proc
2014-12-31 20:47:32 +01:00
tkdrg
2dea549a25
Merge pull request #6683 from joonoro/master
...
Fixes arcade machine runtimes from #6351
2014-12-31 16:20:15 -03:00
tkdrg
cb5428c554
Merge pull request #6685 from phil235/VisibleLingMsgFix
...
Fixes people getting the Ling's message when he reassimilates its armblade/shield.
2014-12-31 16:06:00 -03:00
Menshin
b4e3b942db
Removed a useless call to ..() in obj/pipe attack_by
2014-12-31 17:34:47 +01:00
phil235
e476074b32
Merge pull request #6673 from GunHog/FixForTatorAIRadioAndRemovesSpice
...
Fixes #6654
2014-12-31 15:41:17 +01:00
phil235
3ce15f31b0
Merge pull request #6672 from Menshin/flash_emp_runtime_fix
...
Fixes flashes runtiming on EMP + flash spamming
2014-12-31 15:33:20 +01:00
Menshin
34cee3f088
Renamed confusing variable
2014-12-31 13:51:39 +01:00
iamgoofball
a0092b8e1b
Conflicts: code/game/gamemodes/wizard/spellbook.dm
2014-12-30 20:22:11 -08:00
iamgoofball
b63b7e528a
Made Ragin' Mages actually work, ports and fixes from Hippiestation, improvements to the pacing, etc etc.
2014-12-30 17:34:58 -08:00
Menshin
4db3268fcb
Fixes runtime when moving objects in/out storage while a clientless mob is peeking on the storage panel
2014-12-31 01:54:25 +01:00
tkdrg
829ba09986
Merge pull request #6244 from Ergovisavi/halp_medics_griffon_me
...
Adds Medical Hologram functionality to Medical Penlight
2014-12-30 20:52:46 -03:00
joonoro
716e14f716
Fixes arcade machine runtimes from #6351
2014-12-30 21:11:22 +02:00
phil235
008f0e1b16
Fixes blind people getting the Ling's message when he reassimilates his armblade/shield.
2014-12-30 18:59:15 +01:00
tkdrg
0d33cc98af
Merge pull request #6660 from Firecage/Mineral_Floor_Effects
...
Adds effects for the following mineral floors: Plasma, Uranium, Bananium...
2014-12-30 13:18:25 -03:00
joonoro
663e7d673a
Fixes arcade machine runtime from #6351
2014-12-30 17:33:52 +02:00
Razharas
d1f347f584
Fixes conflicts
...
There werent even any conflicts really, but git for some reason thought
there are
2014-12-30 15:12:09 +03:00
Perakp
953aab610c
Changes a few more checks to accept drones in addition to silicons.
2014-12-30 13:50:10 +02:00
Razharas
084d193409
Fixed dualsabers and hulks
...
Fixed dualsabers and hulks
2014-12-30 14:47:07 +03:00
Perakp
ee3617310e
Merge remote-tracking branch 'upstream/master' into droneFix
2014-12-30 13:32:51 +02:00
Menshin
168b98840f
Fixes flashes runtiming on emp_act()
...
Fixes flash messages spam (#6631 )
Some code cleaning
2014-12-30 10:50:43 +01:00
tkdrg
2607a456c0
Merge pull request #6634 from paprka/chefuniform
...
Makes the second cook spawn in short order cook clothes, fixes chef uniform
2014-12-30 03:45:13 -03:00
Ergovisavi
f3251c7224
Adds a Medical Hologram functionality to the medical penlight
2014-12-29 21:44:44 -08:00
hornygranny
a9ea5e98a9
Update walls.dm
2014-12-29 20:31:47 -08:00
paprka
13539c5c8e
Merge branch 'master' of https://github.com/tgstation/-tg-station into nitrile
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
code/modules/clothing/gloves/boxing.dm
code/modules/clothing/gloves/miscellaneous.dm
2014-12-29 20:19:57 -08:00
paprka
c26de0f5d3
adds nitrile gloves
2014-12-29 20:14:41 -08:00
paprka
1cfdf56f0c
fixes the switch checks
2014-12-29 19:29:31 -08:00
paprka
742d7b4383
IRON CHEF switches
2014-12-29 19:26:13 -08:00
hornygranny
9ee5d52814
Merge pull request #6601 from paprka/walkthecat
...
Adds catwalks
2014-12-29 19:05:41 -08:00
GunHog
4f3d955ca1
Fixes #6654
...
Sets the AI's encryption key to slot 2 so it is not lost upon the AI
being traitorized.
Fixes #6654 by reverting the change in #6399 to the AI's key.
2014-12-29 19:55:01 -06:00
Firecage
6046e3ee2c
Uranium Floor Rad Reducement
2014-12-30 00:04:29 +02:00
Firecage
427cdc6827
Final Mineral Floor Fixes
2014-12-29 23:58:41 +02:00
