c227ebefe8
Updated base object and fixed missing line.
2015-01-03 23:48:21 +00:00
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
1153ef4700
Merge pull request #6651 from paprka/tablesandwindowsbaby
...
Fixes shuttle windows smoothing with normal windows
2015-01-03 00:22:29 +01:00
ad5872e84f
fixes window junction update to use initial icon state
2015-01-02 15:14:36 -08:00
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
38acdca156
Merge pull request #6713 from phil235/DicerollRuntimeFix
...
Fixes runtime linked to diceroll proc
2015-01-01 16:58:39 -03:00
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
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
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
371b66a334
Merge pull request #6678 from paprka/nitrile
...
Adds nitrile gloves
2015-01-01 00:29:04 -03:00
908922f24c
Fixes Hulk crash bug and typos
2014-12-31 23:28:14 -03:00
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
cdb5066502
Merge pull request #6324 from Razharas/GenShit
...
Added datum mutations
2014-12-31 17:24:15 -03:00
57cf4bc394
Fixes runtime linked to diceroll proc
2014-12-31 20:47:32 +01:00
e476074b32
Merge pull request #6673 from GunHog/FixForTatorAIRadioAndRemovesSpice
...
Fixes #6654
2014-12-31 15:41:17 +01:00
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
34cee3f088
Renamed confusing variable
2014-12-31 13:51:39 +01:00
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
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
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
084d193409
Fixed dualsabers and hulks
...
Fixed dualsabers and hulks
2014-12-30 14:47:07 +03:00
ee3617310e
Merge remote-tracking branch 'upstream/master' into droneFix
2014-12-30 13:32:51 +02:00
168b98840f
Fixes flashes runtiming on emp_act()
...
Fixes flash messages spam (#6631 )
Some code cleaning
2014-12-30 10:50:43 +01:00
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
f3251c7224
Adds a Medical Hologram functionality to the medical penlight
2014-12-29 21:44:44 -08:00
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
c26de0f5d3
adds nitrile gloves
2014-12-29 20:14:41 -08:00
9ee5d52814
Merge pull request #6601 from paprka/walkthecat
...
Adds catwalks
2014-12-29 19:05:41 -08:00
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
d7765cd75f
Merge pull request #6630 from tkdrg/rpdcolor
...
Tested, appears to be functioning as advertised. Cue drones making absurd disposal rides.
2014-12-29 11:14:20 -08:00
d96e8df573
Fixes some RPD bugs
...
Fixes pipe painting not working
Fixes 4-way manifolds and disposals chutes displaying broken icons
Fixes the lack of Sort Junctions from the RPD
Fixes #6627
Fixes drones being unable to use the RPD
2014-12-29 14:51:41 -03:00
501a120cca
Fixes the defines
...
Now all the shit uses them i hope
2014-12-29 16:25:33 +03:00
58b10962dc
clicking on the lattice will now construct a catwalk as well
2014-12-29 05:24:48 -08:00
b52a3915fb
Fixes shuttle windows smoothing with normal windows
2014-12-29 04:58:53 -08:00
10b21b20ab
Conflicts resolution
...
In items weapons melee misc
2014-12-29 11:49:30 +03:00
418e3a0613
General cleanup
...
Fixed the magic text failing in monkey injectors
Removed lots of comments
Didnt fix mysterious list bounds runtime in tourettes
2014-12-29 11:36:01 +03:00
152be974dc
reverts return change (returns return change?)
2014-12-28 18:53:44 -08:00
bbc83fed1c
Merge branch 'master' of https://github.com/tgstation/-tg-station into policebatonfixy
2014-12-28 18:39:39 -08:00
91685820f2
Merge pull request #6588 from phil235/WindowEjectionFix
...
Removed the ability of windows to be unanchored and ejected when low on health
2014-12-28 21:20:02 -03:00
e8738e8dd5
Changes some clothing and chef gear
2014-12-28 02:13:28 -08:00
76a21883a8
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
...
Conflicts:
code/game/mecha/mecha.dm
code/game/objects/structures/tables_racks.dm
code/modules/mob/living/silicon/silicon.dm
code/modules/projectiles/gun.dm
Fixes dem conflicts
2014-12-28 11:20:15 +03:00
acd40bdde8
further updates smoothing and icons
2014-12-28 00:17:19 -08:00
208b59c30e
Fixed stuff tkdrg pointed out
...
Added comment to dualsaber and hulk checks to explain whats going on
Added defines that converts to mutation names
Fixed grammer again
2014-12-28 10:49:04 +03:00
79e2eedacb
Merge branch 'master' of https://github.com/tgstation/-tg-station into walkthecat
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2014-12-27 22:26:21 -08:00
cc474b2af6
Merge pull request #6591 from phil235/FingerlessSpriteFix
...
Fix fingerless gloves icon and washing machine changing boxing gloves
2014-12-27 15:46:43 -03:00
a614839f82
Merge pull request #6573 from paprka/fixescaps
...
Fixes capgun ammo sprites
2014-12-27 18:14:28 +01:00
517d17d9e2
Merge pull request #6585 from phil235/SwirlieFix
...
Fixed being able to spam slam someone onto a toilet during a swirlie.
2014-12-27 10:33:24 -03:00
7ee2317ec3
Merge pull request #6207 from phil235/RecursiveHearVisibleMessage
...
Mob inside something can now see visible_message()'s
2014-12-27 13:20:50 +01:00
fc7c7b520d
Merge pull request #6348 from paprka/highspeednodrag1v1mem80quickscopenotaser
...
Blood-red hardsuit usability feature and syndicate loadout adjustments
2014-12-27 02:59:24 -03:00
0b4261e016
Merge pull request #6355 from AnturK/librarian_pda
...
Adds Librarian PDA cartridge
2014-12-27 01:44:49 -03:00
Matt Smith