f7342415c1
Merge pull request #7959 from phil235/AttackSelfTKFix
...
A bunch of fixes
2015-02-25 19:54:36 -08:00
4826037b00
Merge pull request #7981 from MrStonedOne/revert-7970-removegaytider
...
Revert "Removes grey tide barsign"
2015-02-25 18:47:53 +01:00
33d0507c8d
Suggested changes to graytide sign's desc wording
2015-02-25 08:10:42 -08:00
05b2ec1e5f
Merge pull request #7420 from Steelpoint/HoSGun
...
Head of Security's Personal Firearm
2015-02-25 10:27:22 +03:00
48ce33f3cb
Revert "Removes grey tide barsign"
2015-02-24 23:04:16 -08:00
9ba1dfaa26
Merge pull request #7970 from paprka/removegaytider
...
Removes grey tide barsign
2015-02-25 00:29:36 -06:00
9ce2add084
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/obj/guns/energy.dmi
2015-02-25 14:10:54 +08:00
417b49ab2b
Merge pull request #7703 from paprka/youlovenerfs
...
Electrode and stun revolver changes
2015-02-25 09:08:10 +03:00
1d552123dc
hos gun revert
2015-02-24 21:54:48 -08: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
393123b50b
Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs
...
Conflicts:
code/modules/projectiles/gun.dm
icons/obj/guns/energy.dmi
2015-02-24 20:03:33 -08:00
da53175ad5
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/mob/inhands/guns_lefthand.dmi
icons/mob/inhands/guns_righthand.dmi
icons/obj/guns/energy.dmi
2015-02-25 11:44:27 +08:00
830b57afd5
removes grey tide barsign
2015-02-24 15:32:58 -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
79de9615dc
Fixes not being able to prime grenade, toggle lamps and other attack_self things with TK.
...
Fixes the blobbernaut death animation looping.
Fixes armchair layer being above ghost layer.
Fixes chloral hydrate metabolization rate (and 2 other reagents)
Fixes a typo in closet/attack_self() .
2015-02-24 16:36:40 +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
984b7cb8f6
Merge pull request #7738 from Incoming5643/mediborg_inbuiltstretcher
...
Mediborg Improvement Drive: Roller Robo Da
2015-02-23 17:10:43 +01: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
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
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
1db8a718a6
ChangeSpawnAreas
2015-02-23 01:48:20 +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
31491a5e27
quick push of everything I have now, fucking foam
2015-02-21 13:36:16 -08: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
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
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
hornygranny
Swag McYolosteinen
MrStonedOne
Razharas
Cheridan
Steelpoint
paprka
Iamgoofball
Remie Richards
phil235
phil235
Mandurrrh
xxalpha