Steelpoint
f72ced26fd
PulseRifleVarients+ArmouryRooms+FixesAndRefinements
2015-01-01 13:33:23 +08:00
Steelpoint
dd111a7c54
EmergencyResponseTeam
2014-12-31 17:31:45 +08:00
tkdrg
2607a456c0
Merge pull request #6634 from paprka/chefuniform
...
Makes the second cook spawn in short order cook clothes, fixes chef uniform
2014-12-30 03:45:13 -03:00
hornygranny
9ee5d52814
Merge pull request #6601 from paprka/walkthecat
...
Adds catwalks
2014-12-29 19:05:41 -08:00
paprka
58b10962dc
clicking on the lattice will now construct a catwalk as well
2014-12-29 05:24:48 -08:00
tkdrg
91685820f2
Merge pull request #6588 from phil235/WindowEjectionFix
...
Removed the ability of windows to be unanchored and ejected when low on health
2014-12-28 21:20:02 -03:00
paprka
e8738e8dd5
Changes some clothing and chef gear
2014-12-28 02:13:28 -08:00
paprka
acd40bdde8
further updates smoothing and icons
2014-12-28 00:17:19 -08:00
paprka
79e2eedacb
Merge branch 'master' of https://github.com/tgstation/-tg-station into walkthecat
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2014-12-27 22:26:21 -08:00
tkdrg
cc474b2af6
Merge pull request #6591 from phil235/FingerlessSpriteFix
...
Fix fingerless gloves icon and washing machine changing boxing gloves
2014-12-27 15:46:43 -03:00
tkdrg
517d17d9e2
Merge pull request #6585 from phil235/SwirlieFix
...
Fixed being able to spam slam someone onto a toilet during a swirlie.
2014-12-27 10:33:24 -03:00
tkdrg
fc7c7b520d
Merge pull request #6348 from paprka/highspeednodrag1v1mem80quickscopenotaser
...
Blood-red hardsuit usability feature and syndicate loadout adjustments
2014-12-27 02:59:24 -03:00
paprka
0e4903bd83
Merge branch 'master' of https://github.com/tgstation/-tg-station into walkthecat
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2014-12-26 18:35:12 -08:00
paprka
3ca6d769a1
adds catwalks
2014-12-26 17:38:55 -08:00
Remie Richards
84649dacd4
Merge pull request #6339 from tkdrg/rip'd
...
Ports the rapid pipe dispenser (RPD) from /vg/
2014-12-26 23:58:17 +00:00
paprka
5c8a8b5dca
Merge branch 'master' of https://github.com/tgstation/-tg-station into highspeednodrag1v1mem80quickscopenotaser
...
Conflicts:
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
2014-12-26 09:09:24 -08:00
phil235
b6e35278e3
Fixes cutting black gloves to make fingerless gloves not changing the icon to fingerless.
...
Fixes the washing machine being able to change boxing gloves, ninja gloves and botany gloves to look like simple colored gloves. Creating a /gloves/color category for all gloves whose color can be changed.
Fixing some absolute pathing.
2014-12-26 17:04:09 +01:00
tkdrg
a94012b98a
Ports the rapid pipe dispenser (RPD) from /vg/
...
These are pocket devices that dispense unwrenched atmos/disposal pipes.
Despite the admittedly misleading name, these have infinite ammo.
There is no need to reload with matter cartridges or anything like that.
Currently, they spawn in atmos tech lockers, and as an engiborg module.
More can be obtained with the autolathe.
They are also a traitor "steal item" objective.
2014-12-25 22:06:39 -03:00
paprka
21df99154d
Merge branch 'master' of https://github.com/tgstation/-tg-station into burtsfiya
...
Conflicts:
code/modules/projectiles/gun.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/modules/projectiles/guns/projectile/shotgun.dm
icons/obj/gun.dmi
2014-12-25 13:51:43 -08:00
paprka
404da4dbdd
code optimizations
2014-12-25 13:28:05 -08:00
paprka
a6acdeb3c2
initial commit
2014-12-25 13:07:06 -08:00
paprka
7842ff8803
adds advanced tasers as default
2014-12-24 19:41:40 -08:00
paprka
1d1baa96bc
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-12-24 18:56:26 -08:00
phil235
558f263732
Removed the ability of windows to be unanchored and ejected when low on health.
2014-12-24 20:45:47 +01:00
phil235
bec442796c
Fixed being able to spam slam someone onto a toilet during a swirlie.
...
Added sound when slamming someone onto the toilet and when slamming the toilet lid onto someone's head.
Nerfed the damage for these two actions a bit.
Fixes the victim's message for these actions not being bold red.
2014-12-24 17:10:27 +01:00
phil235
70edf69f25
Fixes table having two mousedrop_T() procs.
...
Adding a rack_destroy() proc.
Fixes table blob_act and ex_act a bit.
2014-12-23 00:22:57 +01:00
paprka
47659dbbf4
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2014-12-21 20:32:34 -08:00
paprka
f1963ce537
Merge branch 'master' of https://github.com/tgstation/-tg-station into parahats
...
Conflicts:
code/modules/clothing/head/soft_caps.dm
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2014-12-19 10:41:27 -08:00
Cheridan
566066a73a
Merge pull request #6441 from paprka/corpsecthecorpening
...
Corporate Security aesthetic update
2014-12-18 02:14:33 -06:00
paprka
9d46ccceac
old warden jacket for the lockers
2014-12-17 23:01:10 -08:00
Cheridan
62252f0273
Merge pull request #6420 from phil235/TypoFix2
...
Fixes a lot of "the the" in messages.
2014-12-17 16:06:35 -06:00
paprka
4075e59e04
corporate security initial commit
2014-12-17 08:14:22 -08:00
Razharas
82654b579a
Merge pull request #6395 from Steelpoint/master
...
Security Beret + Jumpsuit Sprites
2014-12-17 13:53:45 +03:00
paprka
f0d80d487d
adds EMT caps
2014-12-16 21:04:27 -08:00
phil235
d5a7d82959
Fixes a lot of "the the" in messages.
2014-12-16 22:59:55 +01:00
Cheridan
79af296b6d
Merge pull request #6366 from phil235/ChairSpinningFix
...
Fixes not being able to rotate your chair while buckled to it.
2014-12-16 12:27:35 -06:00
Swag McYolosteinen
2cbcda1a5f
Merge pull request #5702 from Donkie/traylayer
...
Morgue/Crematorium update
2014-12-16 14:27:49 +01:00
Steelpoint
fb5eeb4265
HoP/BartenderArmor
2014-12-16 15:35:49 +08:00
Cuboos
0bb7d2a5a5
Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1
...
Conflicts:
code/game/objects/items/weapons/defib.dm
config/admins.txt
2014-12-15 18:12:14 -08:00
Steelpoint
4b9a87a808
MoveBeretsToSecureLocker
2014-12-15 19:46:32 +08:00
Cheridan
024817b0b2
Merge pull request #6154 from phil235/ClosetResistFix
...
Fixes not being able to get out of a wrapped closet by resisting
2014-12-15 02:53:33 -06:00
paprka
1fd9e6bfda
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
icons/obj/gun.dmi
2014-12-14 21:55:28 -08:00
Cheridan
7491cc38f7
Merge pull request #6346 from TZK13/Chemical-Closet-Sprites
...
Adds distinct sprites for the chemical closet
2014-12-14 23:21:04 -06:00
paprka
e6f88851ac
Adds select fire for burst fire weapons
2014-12-14 20:13:09 -08:00
phil235
61c8d6ab33
Fixes not being able to rotate your chair while buckled to it.
2014-12-14 18:11:49 +01:00
Daniel Hultgren
5071d307b0
Can now click switch with any object
2014-12-14 12:22:15 +01:00
paprka
303564638b
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
code/game/jobs/job/security.dm
2014-12-13 22:58:22 -08:00
paprka
db6eabfc4e
intial commit for syndicate hardsuit feature
2014-12-13 22:26:09 -08:00
Razharas
bafef911d4
Merge pull request #6317 from paprka/saltyfuckingcuntm8
...
Security aesthetic overhaul
2014-12-14 07:57:33 +03:00
TZK13
0df50e5c6e
Adds distinct sprites for the chemical closet.
2014-12-13 22:04:43 -06:00
