969b301930
Merge pull request #8028 from Cheridan/foam_hose
...
Fixes metal foam dispenser mode for atmos backpack tank.
2015-03-02 16:47:29 +01:00
9f62e2c387
Merge pull request #8055 from xxalpha/xxmas
...
Removes Santa Hats from security wardrobe closets and the festivus pole from RD's office.
2015-03-01 20:04:52 -06:00
111cb2a009
Merge pull request #8018 from phil235/BugFixA
...
A bundle of fixes
2015-03-01 06:44:02 +03:00
960cc8dff6
Merge pull request #8021 from RemieRichards/AltClick-PixelPlacement-InteractionFix
...
Table-Item Pixel Placement Improvements
2015-03-01 06:42:44 +03:00
8cee97f54f
Merge pull request #7942 from dannno/nothingmatters
...
THE OWL RETURNS
2015-02-28 16:06:35 +00:00
4475f541b9
Merge pull request #8033 from TheVekter/medbackpacks
...
Gives Medical professions and Botany unique backpacks and satchels
2015-02-28 08:42:20 +03:00
52c5abd536
Adds new backpacks to job lockers also changelog
2015-02-27 20:26:17 -06:00
b794cf5211
New Botany backpack and satchel. Also fixes satchel spawning without iconstate.
2015-02-27 20:02:24 -06:00
7859dd2fdf
Removes Santa Hats from security wardrobe closets and other.
2015-02-28 01:01:19 +00:00
2474e84299
REALLY FIXED THIS TIME LOL
2015-02-27 15:59:50 -05:00
027eccedbc
conflicts fixed
2015-02-27 14:01:42 -05:00
d2f44872aa
Adds emp, emag, and repairs for barsign.
2015-02-27 12:01:09 -05:00
abee661784
Adds in Nienhaus' departmental backpacks and fixes itemstate for a few satchels.
2015-02-26 23:39:27 -06:00
bcd3a5b3b7
Fixes metal foam dispenser mode for atmos backpack tank.
...
>>you will never refactor something without overlooking something dumb and breaking it
2015-02-26 22:26:12 -06:00
f7d3692a6b
Clamps the value of pixel placed items between -(world.icon_size/2) and world.icon_size/2, so -16 and 16 respectively.
2015-02-26 23:17:59 +00: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
7171cd252b
Fixes no blood dna on Mulebot and its blood tracks.
...
Fixes putting buckled mobs onto morgue trays.
Fixes mob pixel offset when unbuckled from roller bed.
Fixes blood trail appearing when pulling a patient on a roller bed.
Fixes other minor stuff.
2015-02-26 19:31:55 +01:00
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
44ea489940
THE OWL RETURNS: PART 2: REVENGE OF THE GRIFFIN
...
- adds The Griffin costume to the autodrobe
2015-02-23 17:30:17 -05:00
e889ee7a42
Merge pull request #7700 from RemieRichards/ExplosionsAndEmbedding
...
Items Embedding in Limbs
2015-02-24 01:22:01 +03:00
e8fb3d1f05
THE OWL RETURNS: PART 1: THE PLASMA RISES
...
- all owl items resprited
- owl wings added; suit slot item, wings are toggleable
2015-02-23 16:49:17 -05: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
Swag McYolosteinen
Cheridan
Razharas
Remie Richards
TheVekter
xxalpha
dannno
Mandurrrh
phil235
hornygranny
MrStonedOne
Steelpoint
paprka
Iamgoofball
phil235