Anonymous
837052740a
Merge branch 'master' into assu
...
# Conflicts Resolved:
# icons/mob/head.dmi
# icons/obj/clothing/hats.dmi
2019-11-13 11:59:53 +03:00
kevinz000 and GitHub
e0626d12b1
Merge pull request #9707 from BonniePandora/Weldhelmets
...
Port Welding Hard Hats from /tg/
2019-11-10 11:30:54 -07:00
Anonymous
0849ea365f
Merge branch 'master' into assu
2019-11-05 15:45:04 +03:00
Ghommie
a650e1e411
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
2019-11-05 05:37:28 +01:00
BonniePandora
5efed32095
Ports Welding Hard Hats from /tg/
...
Changelog:
modules/clothing/head/Hardhat.dm:
-Added Welder Hard Hats & various colours
--They function as a combi hard hat & welder mask, but have a slightly dimmer head lamp
modules/clothing/vending/wardrobes.dm
-Added 3 Welder Hard Hats to the Engi-drobe and Atmos-drobe
-Equalized some values between the two (3 atmos winter coats now instead of 5, and 3 engineering dufflebags instead of 2)
game/objects/structures/crates_lockers/closets/secure/engineering.dm
-Replaced the welding mask in the CE's locker with a white WHH (This one has brighter buld in it! Same brightness as a regular hard hat)
datums/action.dm
- Added the item_action to lower the WHH's face shield
icons/mob/head.dmi
-Added weldervisor + welderhat, which are used by the WHH's
-Recoloured hardhat0/1_dblue to be in atmos colours as I've never seen it on the station before and this way is actually used
icons/mob/obj/hats.dmi
-Added weldervisor, again, used by the WHH's
-Repositioned the hardhat sprites up several pixels so they don't clip and look weird with the weldervisor
-Recoloured hardhat0/1_dblue to be in atmos colours as I've never seen it on the station before and this way is actually used
2019-11-04 02:29:56 +00:00
kevinz000 and GitHub
0615189629
Merge pull request #9665 from Ghommie/Ghommie-cit295
...
Removing references to national socialism
2019-11-03 06:18:47 -07:00
Anonymous
5930389cb6
Merge branch 'master' into assu
2019-10-30 15:18:39 +03:00
Ghommie
005c87bdf6
I'm making a joke title, don't ban me github.
2019-10-30 01:31:29 +01:00
Anonymous
ad00e6b36a
Merge branch 'master' into assu
2019-10-28 19:02:48 +03:00
Ghommie
80cd4902ca
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273
2019-10-28 00:49:22 +01:00
Linzolle
bdd553d4f7
thanks ghom
2019-10-27 17:26:55 -05:00
Anonymous
203509b405
Poll said its DAB
2019-10-27 16:27:03 +03:00
Linzolle
5bafab9447
missing period
2019-10-25 16:34:32 -05:00
MMMiracles and Linzolle
8fb0a68feb
Adds Hat Throwing ( #45355 )
...
* adds hat throwing on people and borgs
* clothing flags, hats can knock off non-items, borg hat blacklist check
* prevents hats with items in them from being able to land on heads
* removes extra equip, hats can go on the hatless again, tinfoil fix
* if
* bit flag
2019-10-25 16:19:19 -05:00
Ghommie
ad7101d0aa
ports anti-magic component code updates (holymelon not included).
2019-10-25 03:20:42 +02:00
Anonymous
f592aca594
Merge branch 'master' into assu
2019-10-24 17:18:26 +03:00
Anonymous
32d2476112
Moves stuff from modular, updates sprites
...
Also, digitigrade variant is corrected, hopefully.
2019-10-21 15:24:06 +03:00
Poojawa
5876a235c2
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-22 00:22:18 -05:00
kevinz000 and GitHub
5608d37fd5
Merge pull request #9263 from Trilbyspaceclone/batter_up
...
Adds a new traitor bundle - Synda Major Leage Player
2019-09-21 01:56:41 -07:00
Poojawa
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -05:00
TrilbySpaceClone
626e525d24
..?
2019-09-12 23:36:59 -04:00
TrilbySpaceClone
6a36e5a317
huh
2019-09-12 23:26:07 -04:00
TrilbySpaceClone
0e12a4f8d1
and swing!
2019-09-08 21:39:32 -04:00
Sishen
3f86a92efa
Merge branch 'walk-like-an-egyptian' into walklikeanegyptian
2019-08-23 14:42:35 -04:00
Poojawa
96834bc517
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-20 03:36:17 -05:00
Sishen
ed2c3f3cbd
Fixes spelling mistakes, adds pharaoh gear to chaplain vendor
2019-08-19 13:53:05 -04:00
Poojawa
088bc484e3
Forensics re-destroyed, but better this time.
...
All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
2019-08-17 02:43:59 -05:00
Poojawa
0290a46ddc
Impliments Ghom review, reverts blood list back to component
2019-08-15 12:32:44 -05:00
lolman360 and GitHub
0451390778
control click and then drag is easy
2019-08-11 11:16:19 +10:00
Poojawa
3499d73f6b
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
2019-07-31 19:24:39 -05:00
kevinz000 and GitHub
2ec5d3f02e
Merge pull request #8886 from Ghommie/Ghommie-cit137
...
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-14 14:05:20 -07:00
kevinz000 and GitHub
d5f156925d
Merge pull request #8884 from Ghommie/Ghommie-cit135
...
Ports "About that beer I owed ya. Adds blueshirt items to sectech and defines them better."
2019-07-14 03:37:36 -07:00
Ghommie
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
Ghommie
31bd9104bb
Ports "Adds blueshirt items to sectech and defines them better."
2019-07-13 06:42:09 +02:00
kevinz000 and GitHub
1eaddd3ebf
Merge pull request #8853 from Ghommie/Ghommie-cit125
...
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
2019-07-12 07:34:19 -07:00
Ghommie
490ae9daf2
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
2019-07-09 07:58:22 +02:00
Linzolle
1731d4a266
normalises hop and cap's berets to not hide hair
2019-07-07 01:44:58 -05:00
Ghommie
cb255b8719
give'r or leave'r, buddy.
2019-06-09 06:54:26 +02:00
Ghommie
7706ec6329
I LOVE THE SMELL OF NAPALM IN THE MORNING!
2019-06-09 02:45:14 +02:00
Poojawa
971ddef989
reverts forensics components. If I can't figure it out, MURDER IT
2019-05-22 04:10:29 -05:00
Poojawa
69eca2ae4b
progress, just need to fiddle with footprints again
2019-05-07 13:23:49 -05:00
Poojawa
105b40a4f8
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-05-06 02:53:42 -05:00
Trilbyspaceclone and GitHub
70c5c47490
Lets not mistakenly nerf hop please?
2019-04-25 23:51:09 -04:00
Trilbyspaceclone and GitHub
39fcf27beb
Update jobs.dm
2019-04-25 23:48:12 -04:00
Poojawa
a772f532c3
Synthetic and RNG blood
2019-04-16 04:28:04 -05:00
Poojawa
499078fb10
Headgear is more aggressive in setting normal style stuff
...
I swear byond's gotten a lot more dumb about if statements...
2019-04-15 22:04:37 -05:00
Poojawa
fb234783a7
muzzle-compatible helmets and masks
2019-04-12 04:00:47 -05:00
Poojawa
7ffe49c511
Merge remote-tracking branch 'refs/remotes/origin/master' into muzzled-masks
2019-04-09 22:18:56 -05:00
Cyprian
644a5a1e66
Berettide!
2019-04-06 22:52:26 +02:00
Poojawa
fb1b76cafe
compiles but I don't feel like spriting atm
2019-03-18 02:00:00 -05:00
Anonymous