hornygranny
f7342415c1
Merge pull request #7959 from phil235/AttackSelfTKFix
...
A bunch of fixes
2015-02-25 19:54:36 -08:00
Swag McYolosteinen
4826037b00
Merge pull request #7981 from MrStonedOne/revert-7970-removegaytider
...
Revert "Removes grey tide barsign"
2015-02-25 18:47:53 +01:00
MrStonedOne
33d0507c8d
Suggested changes to graytide sign's desc wording
2015-02-25 08:10:42 -08:00
Razharas
05b2ec1e5f
Merge pull request #7420 from Steelpoint/HoSGun
...
Head of Security's Personal Firearm
2015-02-25 10:27:22 +03:00
MrStonedOne
48ce33f3cb
Revert "Removes grey tide barsign"
2015-02-24 23:04:16 -08:00
Cheridan
9ba1dfaa26
Merge pull request #7970 from paprka/removegaytider
...
Removes grey tide barsign
2015-02-25 00:29:36 -06:00
Steelpoint
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
paprka
1d552123dc
hos gun revert
2015-02-24 21:54:48 -08:00
paprka
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
Steelpoint
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
paprka
830b57afd5
removes grey tide barsign
2015-02-24 15:32:58 -08:00
Remie Richards
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
phil235
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
Swag McYolosteinen
984b7cb8f6
Merge pull request #7738 from Incoming5643/mediborg_inbuiltstretcher
...
Mediborg Improvement Drive: Roller Robo Da
2015-02-23 17:10:43 +01:00
hornygranny
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
hornygranny
c0c8a739e2
Merge pull request #7721 from paprka/miening
...
Mining & mine-related chem changes
2015-02-22 20:17:24 -08:00
Steelpoint
1db8a718a6
ChangeSpawnAreas
2015-02-23 01:48:20 +08:00
Swag McYolosteinen
1035d95f90
Merge pull request #7716 from paprka/megaphoney
...
Adds megaphones
2015-02-22 12:58:49 +01:00
phil235
491bc2380b
Fixes office chair layer not updating when moving the chair around.
2015-02-21 11:40:58 +01:00
Mandurrrh
df57ea312b
add singulo description
2015-02-20 12:56:11 -05:00
Mandurrrh
1301fdd9ab
Fixes maps, adds emp barsign, fixes merge conflicts.
2015-02-20 12:08:04 -05:00
Remie Richards
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
paprka
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
Cheridan
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
paprka
074a139576
Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs
...
Conflicts:
icons/obj/guns/energy.dmi
2015-02-18 02:29:07 -08:00
Steelpoint
8b53405b17
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-18 12:50:05 +08:00
paprka
8b12b14f59
hospistol and disabler stun revolver
2015-02-15 13:31:31 -08:00
Cheridan
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
Incoming
136b3ed67b
Fixes the horrible injustice of getting too many pets
2015-02-14 23:54:20 -05:00
Cheridan
76f101de63
Merge pull request #7614 from paprka/preffer
...
Hard-light hazard holotape
2015-02-14 21:59:14 -06:00
Incoming
d53163bded
Adds an onboard roller bed dock that the mediborg can deploy wherever they need for on the spot triage/transportation/surgery/kidnapping. It can only hold one roller bed, but starts with one. This isn't regeneratable, so you can be a dick and steal the borg's bed and they'll have to go back to medbay for a replacement.
2015-02-14 17:52:38 -05:00
phil235
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
paprka
88760896ad
initial commit
2015-02-13 20:59:39 -08:00
paprka
c66327318d
adds megaphones
2015-02-13 15:07:15 -08:00
paprka
54040d9867
stun changes and stun revolver
2015-02-13 09:26:31 -08:00
Steelpoint
940601bcfa
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/obj/guns/energy.dmi
2015-02-13 01:14:52 +08:00
Cheridan
216630f1db
Merge pull request #7572 from phil235/CookingOverhaul
...
Cooking overhaul
2015-02-12 08:01:17 -06:00
phil235
549b71a487
Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
...
Conflicts:
icons/obj/drinks.dmi
Fixing a couple typos. Making sure all eggs used in tablecraft recipes are boiled
2015-02-11 16:13:04 +01:00
Cheridan
65e8a4ce31
Merge pull request #7624 from paprka/defibfuckupv2
...
Defib changes
2015-02-11 08:37:28 -06:00
paprka
3e61bba236
defib changes
2015-02-08 17:06:34 -08:00
Kraseo
91c1a54abd
closes the open()
2015-02-08 23:33:33 +01:00
phil235
732a54fe63
Making all meat subtypes of snacks/meat
...
Adding specific cutlets and raw cutlets for a lot of types of meat.
Enabling reagent transfer from ingredients to resulting dish for foodtablecrafting
Adjusting tablecraft food recipes reagents accordingly.
Adding raw pastry base and pastry base food and including it into certain recipes.
2015-02-08 21:36:54 +01:00
paprka
424dd37782
hard-light holotape
2015-02-08 07:29:10 -08:00
Kraseo
4e18859e7b
fixes lockers/bodybags/etc. shielding you from explosions. whoops!
2015-02-08 15:13:04 +01:00
Kraseo
08e7911f57
fixes a bunch of bugs
2015-02-08 13:27:55 +01:00
phil235
35fb458293
Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
...
Conflicts:
code/modules/food&drinks/food/snacks_other.dm
icons/obj/drinks.dmi
2015-02-07 20:22:49 +01:00
paprka
c527491f41
Merge branch 'master' of https://github.com/tgstation/-tg-station into clothessec
...
Conflicts:
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2015-02-05 17:44:22 -08:00
Cheridan
fdb9c92736
Merge pull request #7494 from paprka/dirsigns
...
Adds directional signs from bay
2015-02-05 16:28:26 -06:00
phil235
e4464b3b9f
Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
2015-02-05 22:35:00 +01:00
Swag McYolosteinen
6fab02e7cd
Merge pull request #7546 from TZK13/Purple-Shorts
...
Adds purple shorts
2015-02-05 18:16:14 +01:00
