8cee97f54f
Merge pull request #7942 from dannno/nothingmatters
...
THE OWL RETURNS
2015-02-28 16:06:35 +00:00
b794cf5211
New Botany backpack and satchel. Also fixes satchel spawning without iconstate.
2015-02-27 20:02:24 -06:00
abee661784
Adds in Nienhaus' departmental backpacks and fixes itemstate for a few satchels.
2015-02-26 23:39:27 -06:00
9b1fa2479b
conflict fixing + changelog
2015-02-26 16:48:11 -05:00
23ecfeebf8
THE OWL RETURNS: PART 4: PRODUCT PLACEMENT
...
- adds The Owl and The Griffin prize toys to the arcade
- adds The Owl and The Griffin posters (legit and contraband respectively)
- adds The Nest barsign
2015-02-26 16:36:44 -05:00
588c79873f
Merge pull request #7562 from Iamgoofball/drugs
...
GOONCHEM: Part 4: Pyrotechnics, Drugs, and Misc. Chemicals
2015-02-25 08:26:21 +03:00
c0ae53a566
changes and shit, adds prespawn colorful smoke grenade for fun times and adminning
2015-02-24 20:15:06 -08:00
b1ff6b7220
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
...
Conflicts:
code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +00:00
23812bfabc
Merge pull request #7901 from Mandurrrh/holotapefix
...
Fixes #7883 Borgs can't pass through holotape
2015-02-24 19:22:19 +01:00
1c7c6fb40c
Merge pull request #7929 from phil235/GauzeMessageFix
...
Fix applying gauze on already bandaged and non bleeding person, the oper...
2015-02-24 10:12:33 -08:00
2d5fe2b41e
Merge pull request #7922 from Mandurrrh/clownbugs
...
Fixes #7910 and #7909 clown related bugs.
2015-02-24 18:56:30 +01:00
4735e1c02a
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
2015-02-23 18:47:21 -08:00
b49a5a934c
Merge pull request #7918 from paprka/weldingshitty
...
Fixes welding tools using fuel when switched on
2015-02-23 15:52:25 -08:00
e889ee7a42
Merge pull request #7700 from RemieRichards/ExplosionsAndEmbedding
...
Items Embedding in Limbs
2015-02-24 01:22:01 +03:00
996d684458
Fix applying gauze on already bandaged and non bleeding person, the operation is now canceled and it only gives the appropriate message.
2015-02-23 14:23:25 +01:00
82a7beb02c
Merge pull request #7888 from xxalpha/crayonruntimes
...
Add initialize for crayons and fix runtime error.
2015-02-22 20:19:55 -08:00
c0c8a739e2
Merge pull request #7721 from paprka/miening
...
Mining & mine-related chem changes
2015-02-22 20:17:24 -08:00
e03d98786b
Fixes #7910 and #7909 clown related bugs.
2015-02-22 20:53:39 -05:00
da9100893f
adds drone access
2015-02-22 18:23:08 -05:00
56912c69ba
Removes help intent block giving silicons freeacess. Everyone else has to walk still.
2015-02-22 17:53:52 -05:00
8c1af4da25
welder fuel usage on switch
2015-02-22 14:15:04 -08:00
97d82b15c2
Fixes #7883 Borgs can't pass through holotape
2015-02-22 09:15:42 -05: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
167f4ef0ee
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
2015-02-21 14:14:50 -08:00
68942e1ace
Merge pull request #7686 from xxalpha/newgraffiti
...
New graffiti.
2015-02-21 12:46:45 +01:00
a0d831a120
rip bacon
2015-02-20 22:10:02 -08:00
e24e94544e
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
...
Conflicts:
code/modules/food&drinks/food/snacks_meat.dm
code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
icons/obj/drinks.dmi
icons/obj/food.dmi
2015-02-20 22:00:53 -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
42fe551665
Merge branch 'master' of https://github.com/tgstation/-tg-station into ExplosionsAndEmbedding
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-02-19 18:16:33 +00: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
5fc7af7fbf
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
...
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00: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
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
6ebd5976f5
Merge pull request #7729 from Incoming5643/mediborg_gauze
...
Mediborg Improvement Drive: The man in gauze
2015-02-17 18:17:59 +01:00
67f4cc75d9
Fixes the holosign projector not increasing after destroying old signs.
2015-02-16 22:57:06 +01: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
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
Remie Richards
TheVekter
dannno
Razharas
Iamgoofball
phil235
hornygranny
phil235
Mandurrrh
paprka
xxalpha
Swag McYolosteinen
Menshin
Cheridan
paprka