82a7beb02c
Merge pull request #7888 from xxalpha/crayonruntimes
...
Add initialize for crayons and fix runtime error.
2015-02-22 20:19:55 -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
a664c551f1
Merge pull request #7867 from phil235/SlimeBuckleFix
...
Makes slimes unbucklable again.
2015-02-22 20:18:33 -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
1035d95f90
Merge pull request #7716 from paprka/megaphoney
...
Adds megaphones
2015-02-22 12:58:49 +01:00
d8e3f7f28a
fixes usr.stat
2015-02-22 03:37:02 -08:00
f2a27ade31
Add initialize for crayons and fix runtime error.
2015-02-22 02:49:56 +00:00
2dd6b42b14
Makes slimes unbucklable again.
2015-02-21 15:20:34 +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
55208e408d
Merge pull request #7419 from paprka/beltoveray
...
adds a simple overlay system for belts
2015-02-20 07:06:20 +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
da4f8e74d8
Merge pull request #7733 from Cheridan/reagent_foam
...
Reagent Foam
2015-02-18 21:43:50 -08: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
6ebd5976f5
Merge pull request #7729 from Incoming5643/mediborg_gauze
...
Mediborg Improvement Drive: The man in gauze
2015-02-17 18:17:59 +01:00
792becf2b3
fixes kickmine runtime
2015-02-17 09:56:16 -07:00
bca0a7b320
readds kick mine
2015-02-17 09:28:24 -07:00
f12d3d9fbf
cleans up mines
2015-02-17 00:08:28 -07:00
67f4cc75d9
Fixes the holosign projector not increasing after destroying old signs.
2015-02-16 22:57:06 +01:00
702419f265
Merge remote-tracking branch 'upstream/master' into glovening
2015-02-16 12:24:06 +00:00
9f471cb7e4
Reworks fake yellows
...
Replaces the varedited white gloves in the maint loot spawner list with
a subtype of insulated gloves, with the siemens coefficient changed to 1
and a different desc.
2015-02-16 12:20:06 +00:00
15439b8c4e
Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix
...
Conflicts:
code/game/gamemodes/wizard/artefact.dm
2015-02-15 10:27:50 -06:00
136b3ed67b
Fixes the horrible injustice of getting too many pets
2015-02-14 23:54:20 -05:00
76f101de63
Merge pull request #7614 from paprka/preffer
...
Hard-light hazard holotape
2015-02-14 21:59:14 -06:00
743af3a5b2
processing |=
2015-02-14 19:43:27 -08:00
b2071bfdbf
borg updates
2015-02-14 17:38:17 -08:00
f6942bb955
Merge branch 'miening' of https://github.com/paprka/-tg-station into miening
2015-02-14 17:26:19 -08:00
b67f9cec72
Merge branch 'master' of https://github.com/tgstation/-tg-station into miening
2015-02-14 17:08:39 -08:00
bcd76fc64c
fixes redundant passglass
2015-02-14 15:15:22 -08:00
7f56edaa30
compile fix
2015-02-14 15:00:54 -08:00
03e93a43b7
wazer tape
2015-02-14 15:00:02 -08:00
6263436bbb
holotaeb
2015-02-14 14:49:04 -08:00
5e0e4828bd
Merge pull request #7706 from phil235/TrackImplantFix
...
Fix tracking implant description when inserted inside implant pad.
2015-02-14 15:57:16 -06:00
24cef3c30a
fixes baton looping
2015-02-14 12:41:37 -08:00
85ec168881
Foam spreading now respects type.
2015-02-14 13:32:32 -06:00
2885470c50
Adds gauze to Mediborgs, it can be regenerated in chargers much the same as the engiborgs materials
2015-02-14 13:45:23 -05:00
69b856f373
Saving before I ruin everything
...
Lightning works too
Cleans up old shit from Chemistry-Recipes.dm
2015-02-14 11:46:20 -06:00
e5cecc41a6
Merge branch 'master' of https://github.com/tgstation/-tg-station into reagent_foam
2015-02-14 10:50:53 -06:00
135293bedf
Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.
...
Fixes Alien embryo processing that was processed twice.
2015-02-14 14:18:49 +01:00
c119fede36
sponsored by DaZe
2015-02-13 23:40:43 -08:00
hornygranny
xxalpha
Swag McYolosteinen
paprka
phil235
phil235
Cheridan
Mandurrrh
Razharas
Menshin
Delimusca
Thunder12345
Incoming
paprka
Iamgoofball