82a7beb02c
Merge pull request #7888 from xxalpha/crayonruntimes
...
Add initialize for crayons and fix runtime error.
2015-02-22 20:19:55 -08:00
2778eccc1b
Merge pull request #7873 from phil235/SecRecordConsoleFix
...
Fixes not being able to modify certain properties on security record console
2015-02-22 20:19:25 -08:00
fe1ad1a152
Merge pull request #7861 from phil235/OfficeChairLayerFix
...
Fixes office chair layer not updating when moving the chair around.
2015-02-22 20:19:13 -08:00
a5a7b590d3
Merge pull request #7866 from phil235/PullBuckleFix
...
Fixes being able to break free from a pull while handcuffed if the puller is buckled.
2015-02-22 20:18:54 -08:00
a664c551f1
Merge pull request #7867 from phil235/SlimeBuckleFix
...
Makes slimes unbucklable again.
2015-02-22 20:18:33 -08:00
d2b7afa083
Merge pull request #7871 from phil235/NarsieSpamFix
...
Fixes narsie message spam from multiple nar-sie spawn.
2015-02-22 20:18:09 -08:00
c0c8a739e2
Merge pull request #7721 from paprka/miening
...
Mining & mine-related chem changes
2015-02-22 20:17:24 -08:00
cf05a587f9
Code tweak.
2015-02-22 13:58:15 +00:00
8f707e134e
Merge branch 'master' of https://github.com/tgstation/-tg-station into starrlight
...
Conflicts:
code/controllers/configuration.dm
2015-02-22 04:12:54 -08:00
1035d95f90
Merge pull request #7716 from paprka/megaphoney
...
Adds megaphones
2015-02-22 12:58:49 +01:00
c792f211a3
Merge pull request #7555 from paprka/asscap
...
Assistant cap config
2015-02-22 12:58:27 +01:00
d8e3f7f28a
fixes usr.stat
2015-02-22 03:37:02 -08:00
3cd66f4f34
Merge pull request #7739 from paprka/computerlights
...
Computers emitting light
2015-02-22 12:05:34 +01:00
69d4ec3e5f
Merge pull request #7615 from Xhuis/burnfilthypigs
...
Adds malicious modes to air and fire alarms
2015-02-22 12:03:53 +01:00
f2a27ade31
Add initialize for crayons and fix runtime error.
2015-02-22 02:49:56 +00:00
6aff3f3e3f
Fixes not being able to modify certain properties on security record console records.
2015-02-21 19:34:31 +01:00
8f493d64c8
Fixes narsie message spam from multiple nar-sie spawn.
2015-02-21 16:41:17 +01:00
2dd6b42b14
Makes slimes unbucklable again.
2015-02-21 15:20:34 +01:00
e9a943218c
Fixes being able to break free from a pull while handcuffed if the puller is buckled.
...
Add the incapacitated proc to mobs to check for stat, stun, weakened, paralysis, restrained. And replacing those checks by that new proc in some places.
2015-02-21 14:49:47 +01:00
68942e1ace
Merge pull request #7686 from xxalpha/newgraffiti
...
New graffiti.
2015-02-21 12:46:45 +01:00
491bc2380b
Fixes office chair layer not updating when moving the chair around.
2015-02-21 11:40:58 +01:00
fe3764dae8
Merge pull request #7765 from Thunder12345/glovening
...
[REFACTOR] Reworks maintenance fake insulated gloves
2015-02-20 14:24:54 -06:00
b4a1594810
Merge pull request #7797 from Mandurrrh/Barsigntaketwo
...
Adds interchangeable bar signs and a variety of choices.
2015-02-20 19:34:49 +01:00
e861281a03
Merge pull request #7783 from Delimusca/minesofshame
...
cleans up mines
2015-02-20 12:16:14 -06:00
df57ea312b
add singulo description
2015-02-20 12:56:11 -05:00
1301fdd9ab
Fixes maps, adds emp barsign, fixes merge conflicts.
2015-02-20 12:08:04 -05:00
7fbf0a261b
mergeconflictfix
2015-02-20 09:06:04 -05:00
59d3e8be1e
actually fixes luminosity this time guys!
2015-02-20 03:37:16 -08:00
3b3a008e09
further fixes luminosity
2015-02-20 03:35:33 -08:00
7f0373640a
fixes lighting checks
2015-02-20 03:26:56 -08:00
a761fd2306
Merge pull request #7826 from TheVekter/fuckthestation
...
Adds the new Self-Destruct Mechanism to the vault
2015-02-20 08:56:31 +03:00
e6bccac85b
spesslight
2015-02-19 21:05:59 -08:00
55208e408d
Merge pull request #7419 from paprka/beltoveray
...
adds a simple overlay system for belts
2015-02-20 07:06:20 +03:00
383e4e7111
Merge pull request #7792 from Menshin/regen_statis_tweaks
...
Regenerative statis tweaks
2015-02-19 13:07:24 -08:00
5365dd1438
Merge pull request #7799 from paprka/magshit
...
removes bloat from magazines icons
2015-02-19 21:01:46 +03:00
66720a5ce9
Merge pull request #7834 from Menshin/telexploit_fix
...
Deactivates the Hidden Syndicate Teleportation Device
2015-02-19 16:39:49 +01:00
0d0ef9e02a
Deactivates the Hidden Syndicate Teleportation Device
2015-02-19 16:34:49 +01:00
dc4c4ea90b
Merge branch 'master' of https://github.com/tgstation/-tg-station into megaphoney
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/security.dm
2015-02-18 23:15:15 -08:00
dbee9709d1
Merge pull request #7790 from phil235/CryoStingExploitFix
...
Fixes cryosting detection exploit
2015-02-18 21:48:45 -08:00
da4f8e74d8
Merge pull request #7733 from Cheridan/reagent_foam
...
Reagent Foam
2015-02-18 21:43:50 -08:00
d66455bcd9
Adds the new Nuke to the Vault.
...
* Adds some new floor designs as well, which will be implemented for future fuckery
2015-02-18 23:03:51 -06:00
0eb2659d2f
Gives Roboticists their PDA back. Whoops.
2015-02-18 18:53:42 -06:00
7905cc618d
Merge pull request #7773 from phil235/HoloSignFix
...
Fixes the holosign projector sign count not increasing after destroying old signs.
2015-02-18 12:59:50 -08:00
cf3f03c039
Merge pull request #7479 from paprka/batonshit
...
Makes batons slowly lose charge when left on
2015-02-18 21:49:25 +01:00
116143006e
Merge pull request #7746 from Incoming5643/BuyOneGetOneFreePets
...
Fixes the horrible injustice of getting too many pets
2015-02-18 09:38:24 -06:00
1ade8feac8
broken computers and changelogs
2015-02-18 02:16:33 -08:00
69a09417b0
starlight v1
2015-02-18 02:04:52 -08:00
1ac0c26655
Merge pull request #7770 from phil235/AnimationsFix
...
Floating animation and life() fixes.
2015-02-18 02:27:28 -06:00
15e2b88a0f
removes bloat from magazines icons
2015-02-17 19:43:20 -08:00
de4a8af352
Merge pull request #7774 from TheVekter/robobelts
...
Gives Roboticists a full toolbelt
2015-02-18 00:48:58 +03:00
hornygranny
xxalpha
paprka
Swag McYolosteinen
phil235
phil235
Cheridan
Mandurrrh
Razharas
Menshin
TheVekter
paprka