Commit Graph

810 Commits

Author SHA1 Message Date
Lin
9ec8458803 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-12-10 23:52:31 +00:00
Putnam3145
beddaa1a99 Merge pull request #10053 from Ghommie/Ghommie-cit429
Fixes some means of eyes blindness not working, removes legacy code.
2019-12-09 12:40:37 -08:00
Ghommie
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
Putnam3145
6b2d3b116d Merge branch 'master' into Ghommie-cit430 2019-12-05 20:53:14 -08:00
Ghommie
9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
Ghommie
238655d599 Fixes eyes blindness a little. 2019-12-06 00:10:50 +01:00
Seris02
0c5a1b900b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintercoattide 2019-12-05 21:09:38 +08:00
Seris02
2ce79828b8 ratvar coat updated 2019-12-05 20:46:59 +08:00
TrilbySpaceClone
e1717bb534 Merge branch 'master' into crow 2019-12-03 23:45:05 -05:00
Seris02
72e5e17c51 ratvarian and narsian winter coats 2019-12-03 18:16:36 +08:00
Putnam3145
1d91e1acf4 Merge pull request #10016 from deathride58/mousedropfixes
Mousedrop fixes - Adds return value to item mousedrop and fixes bugs with the few things that override it
2019-11-30 22:51:42 -08:00
Seris02
b5f732c838 formal and cc winter coats + start of cult coats 2019-12-01 04:06:03 +08:00
deathride58
b1fca2b74b Mousedrop fixes - Adds return value to item mousedrop and fixes current bugs with the few things that make use of it 2019-11-29 22:59:37 -05:00
Putnam3145
4f018b070f Merge pull request #9996 from Ghommie/Ghommie-cit413
Fixes tinfoil hats giving random traumas.
2019-11-29 06:16:36 -08:00
kevinz000
4183d00da2 Merge pull request #9966 from Ghommie/Ghommie-cit400
Ports elements: Lightweight shared/global components.
2019-11-28 23:08:32 -07:00
kevinz000
f287af694b Merge pull request #9969 from Linzolle/hat-man-bad
revert knocking people's hats off
2019-11-28 23:04:34 -07:00
Ghommie
7990d1328b Fixes tinfoil hats giving random traumas. 2019-11-29 06:48:52 +01:00
Ghommie
3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Linzolle
829cc3d81c Revert "Merge pull request #9613 from Linzolle/hat-toss"
This reverts commit d67b7f620d, reversing
changes made to dabfba8a0d.
2019-11-27 20:23:33 -06:00
Ghommie
dd9116ee70 Ports elements: Lightweight shared/global components. 2019-11-28 01:47:20 +01:00
Ghommie
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
Unknown
4e20f576e6 Merge branch 'master' into xantholne-berets02 2019-11-25 20:16:15 -07:00
Unknown
495b4b6ddc Fixes some issues 2019-11-25 20:13:07 -07:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
Ghommie
7d3599b2f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277 2019-11-22 18:53:58 +01:00
TrilbySpaceClone
b01be3b1ff Merge branch 'master' into crow 2019-11-22 05:48:36 -05:00
Ghommie
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
TrilbySpaceClone
2136968585 Ring ring 2019-11-21 21:55:17 -05:00
Lin
1ddb9935ff Merge pull request #9530 from Ghommie/Ghommie-cit245
Touching up job outfits equip procs, little PDA fix.
2019-11-22 02:37:49 +00:00
Unknown
4974400ccb Merge branch 'master' into xantholne-berets01 2019-11-21 11:01:42 -07:00
Unknown
71b3b8fdc6 Ports/Adds new Berets
Ports some berets adds even more to most jobs
2019-11-20 22:21:20 -07:00
Seris02
60def2a9fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix 2019-11-21 13:08:23 +08:00
kevinz000
8df8acb1b7 Merge pull request #9811 from Ghommie/Ghommie-cit353
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00
Ghommie
a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Seris02
468b6eb609 mining winter coat shtuff
- adds the mining winter coat to mining wardrobes and mining lockers
2019-11-17 22:27:09 +08:00
Anonymous
1bb8ff1c0c Fixes loadout name, adds DAB outfit crate to cargo
For "recruitment" on-station.
2019-11-17 15:08:30 +03:00
Seris02
dea5019bc9 cosmic winter coat yeeeehaw 2019-11-17 20:06:01 +08:00
Seris02
7d99508bd0 adds janitor winter coat 2019-11-17 15:45:12 +08:00
Seris02
b7f4580414 robotics winter coat 2019-11-17 11:50:56 +08:00
Seris02
8db64df364 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix 2019-11-16 16:54:27 +08:00
Seris02
e0e3c510d4 adds QM, CE, HoS, HoP, genetics, chemistry, viro, and RD winter coats 2019-11-16 15:31:20 +08:00
Ghommie
c7a3652d0a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277 2019-11-15 01:12:36 +01:00
kevinz000
9b56aa0cae Merge pull request #9781 from Hatterhat/northstar-fast-intents
northstar works on all intents, is slightly better than help intenting people with the hugs hands
2019-11-14 16:18:31 -07:00
kevinz000
d1ea2d9990 Merge pull request #9554 from NopemanMcHalt/assu
[READY] Desperate Assistance Battleforce
2019-11-14 15:43:51 -07:00
Ghommie
baedb7e091 I'm unprofessional. 2019-11-14 15:16:06 +01:00
Ghommie
7603db2e8b Bad habit of pushing things before the compile. 2019-11-14 15:10:32 +01:00
Ghommie
358db4f390 Dreamchecker compatibility changes, part 2. 2019-11-14 14:54:12 +01:00
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
Hatterhat
8d2f833735 stamina hands 2019-11-11 19:14:12 -06:00
Hatterhat
d27150331a fast hands 2019-11-11 18:59:31 -06:00