70e50e57cd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-12-17 20:21:49 -06:00
73abc2ae40
Merge branch 'master' into xantholne-christmas01
2019-12-14 17:15:00 -07:00
a7c8fb6470
corrects/adds a new dog fashion to telegram hat
2019-12-11 12:43:07 -05:00
414d4b7a90
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408
2019-12-09 00:04:22 +01:00
1e2a4f606c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-12-08 14:17:00 -06:00
97e686cf23
Merge branch 'master' into xantholne-christmas01
2019-12-06 17:21:08 -07:00
e1717bb534
Merge branch 'master' into crow
2019-12-03 23:45:05 -05:00
4f018b070f
Merge pull request #9996 from Ghommie/Ghommie-cit413
...
Fixes tinfoil hats giving random traumas.
2019-11-29 06:16:36 -08:00
233ca30cd6
Merge branch 'master' into xantholne-christmas01
2019-11-28 23:21:36 -07:00
f287af694b
Merge pull request #9969 from Linzolle/hat-man-bad
...
revert knocking people's hats off
2019-11-28 23:04:34 -07:00
7990d1328b
Fixes tinfoil hats giving random traumas.
2019-11-29 06:48:52 +01:00
3b8aebbbc2
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-11-29 00:40:16 +01:00
33854e8fd8
Adds a huge amount of Christmas clothes
2019-11-27 20:07:39 -07:00
829cc3d81c
Revert "Merge pull request #9613 from Linzolle/hat-toss"
...
This reverts commit d67b7f620ddabfba8a0d
2019-11-27 20:23:33 -06:00
a5298dac7e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310
2019-11-27 21:44:56 +01:00
4e20f576e6
Merge branch 'master' into xantholne-berets02
2019-11-25 20:16:15 -07:00
495b4b6ddc
Fixes some issues
2019-11-25 20:13:07 -07:00
cc54e5230f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-11-25 21:01:25 -06:00
66a97cb224
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310
2019-11-22 05:17:42 +01:00
2136968585
Ring ring
2019-11-21 21:55:17 -05:00
4974400ccb
Merge branch 'master' into xantholne-berets01
2019-11-21 11:01:42 -07:00
71b3b8fdc6
Ports/Adds new Berets
...
Ports some berets adds even more to most jobs
2019-11-20 22:21:20 -07:00
a52e292cc8
Ports "examine-code refactor"... part 1...
2019-11-19 03:28:06 +01:00
6aa6eaafe6
Merge branch 'master' into abductor-update
2019-11-15 23:24:51 +00:00
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
df051186eb
Merge branch 'master' into abductor-update
2019-11-11 00:08:59 +00:00
449f9f03c3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310
2019-11-10 21:20:24 +01:00
e0626d12b1
Merge pull request #9707 from BonniePandora/Weldhelmets
...
Port Welding Hard Hats from /tg/
2019-11-10 11:30:54 -07:00
0849ea365f
Merge branch 'master' into assu
2019-11-05 15:45:04 +03:00
a650e1e411
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
2019-11-05 05:37:28 +01:00
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
0615189629
Merge pull request #9665 from Ghommie/Ghommie-cit295
...
Removing references to national socialism
2019-11-03 06:18:47 -07:00
20bafdd855
Unmodularize phantom thief glasses, missing durathread headwear sprites and space-nam clothing.
2019-11-03 03:23:59 +01:00
5930389cb6
Merge branch 'master' into assu
2019-10-30 15:18:39 +03:00
266f1ff958
Merge remote-tracking branch 'upstream/master' into abductor-update
2019-10-29 23:58:01 -05:00
005c87bdf6
I'm making a joke title, don't ban me github.
2019-10-30 01:31:29 +01:00
ad00e6b36a
Merge branch 'master' into assu
2019-10-28 19:02:48 +03:00
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
bdd553d4f7
thanks ghom
2019-10-27 17:26:55 -05:00
203509b405
Poll said its DAB
2019-10-27 16:27:03 +03:00
5bafab9447
missing period
2019-10-25 16:34:32 -05:00
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
ad7101d0aa
ports anti-magic component code updates (holymelon not included).
2019-10-25 03:20:42 +02:00
507e9b7aa0
kinda a dumb workaround
2019-10-24 13:57:00 -05:00
deaf1a0e00
guess tahts what ghom meant
2019-10-24 12:14:22 -05:00
f592aca594
Merge branch 'master' into assu
2019-10-24 17:18:26 +03:00
8f78bfeb26
oops
2019-10-23 21:36:47 -05:00
32d2476112
Moves stuff from modular, updates sprites
...
Also, digitigrade variant is corrected, hopefully.
2019-10-21 15:24:06 +03:00
5876a235c2
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-22 00:22:18 -05:00
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
Linzolle