shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,836 Commits 5 Branches 0 Tags
6d6cc93e50ed1ab15fa4040739f64efef7eec6a0
Commit Graph

10561 Commits

Author SHA1 Message Date
Putnam
d0d469a45a Better roundend logging 2019-11-09 01:00:35 -08:00
Putnam
be464a38b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-08 20:37:29 -08:00
Putnam
cfcf89ebf1 Dynamic controls lots of events now (when active)! 2019-11-08 15:44:38 -08:00
Ghommie
297ee03175 Ports "Cleans up the new alt clicking functionality" from /tg/ 2019-11-08 19:25:09 +01:00
Putnam
825ef80b9d started transferring some events from events to dynamic antags 2019-11-08 06:33:31 -08:00
Seris02
a5a483fb8a makes meteor hallucinations have an ETA now 2019-11-08 19:55:27 +08:00
Putnam
912ca97d29 Added a preference that auto-votes at extremely low weight. 2019-11-08 03:44:22 -08:00
Putnam
d795df1150 made warops part of the dynamic system, in dynamic 2019-11-07 23:39:17 -08:00
Putnam
aab2c4cd3c Added logging to wizard/traitor extra threat spending. 2019-11-07 20:34:02 -08:00
BlackMajor
aaff0bf9e7 Merge pull request #9705 from kappa-sama/patch-4 
thanks major
 2019-11-08 14:17:59 +13:00
BlackMajor
a6bbe75c36 Merge pull request #9611 from Citadel-Station-13/supply-passive-gen 
Adds passive point generation to cargo. Nerfs miasma selling. Increases mindshield crate price.
 2019-11-08 14:17:17 +13:00
Putnam
34015969e8 changed misleading message 2019-11-07 16:35:40 -08:00
Putnam
58603140f9 wow, .len, very cool 2019-11-06 22:03:18 -08:00
Ghommie
b2b1390bd3 Ports techweb backend refactor & co. 2019-11-07 05:07:38 +01:00
TrilbySpaceClone
0662245d80 corrections 2019-11-06 22:52:44 -05:00
Putnam
eb9c8c9aca made glorious death spend threat 2019-11-06 18:07:39 -08:00
Putnam
3bdbb04ea2 Made hijack require threat threshold, spend threat 2019-11-06 17:31:39 -08:00
Putnam
aacb928def Merge branch 'wizard-dynamic' into super-special-awesome-dynamic 2019-11-06 16:29:42 -08:00
Putnam
f3afc5de1b Merge branch 'malf-dynamic' into super-special-awesome-dynamic 2019-11-06 16:03:04 -08:00
Ghommie
ae6e50b081 resprited delivery packages. 2019-11-06 18:27:33 +01:00
Putnam
97493690d3 hmm, also important 2019-11-06 01:34:36 -08:00
Putnam
39bdbde067 Makes summon (X) cost threat in dynamic 2019-11-06 01:26:30 -08:00
BlackMajor
026f9758b9 Actually wait that's way simpler 2019-11-06 12:55:25 +13:00
BlackMajor
960de09a96 Oh there's even more 2019-11-06 12:49:50 +13:00
BlackMajor
9efddbe580 thank you dark souls 2019-11-06 12:47:21 +13:00
Ghommie
97dd0bd70c Yes. 2019-11-05 23:13:10 +01:00
Ghommie
892b66470b Fixing several minor runtimes. 2019-11-05 23:07:29 +01:00
Ghommie
ae9ff92d33 Fixes free real estate paraplegic trait and bolas. 2019-11-05 18:03:50 +01:00
Anonymous
0849ea365f Merge branch 'master' into assu 2019-11-05 15:45:04 +03:00
Winter Flare
4b6d9848ff Update assistant.dm 2019-11-05 01:44:15 -05:00
Winter Flare
74b5961a8d Removed an unneeded line, added gas masks 2019-11-05 01:43:38 -05:00
Winter Flare
87695c0a21 Moved some stuff around, added some more. 
Moved Strange Objects and Sunglasses into silly.dm, modified a few of the bounty prices.
 2019-11-05 00:22:22 -05:00
Ghommie
9cac543a2b Unmodularize secway and turfs 2019-11-05 05:47:25 +01:00
Ghommie
a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Trilbyspaceclone
09cd439f85 so dumb that github suggestions brake " 2019-11-04 17:24:37 -05:00
Ghommie
4ab3512dda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-11-04 23:15:12 +01:00
Trilbyspaceclone
061579decb no fun allowed 2019-11-04 17:08:55 -05:00
Trilbyspaceclone
28b96494e6 huh 2019-11-04 17:03:00 -05:00
Ghommie
29daa0c908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-04 22:59:24 +01:00
Ghommie
8c31c1036d Porting objective code refactor 2019-11-04 22:05:04 +01:00
Trilbyspaceclone
cb215be40d Apply suggestions from code review 
dap the hero

Co-Authored-By: dapnee <33661984+dapnee@users.noreply.github.com>
 2019-11-04 07:21:30 -05:00
TrilbySpaceClone
ae8b43e1c0 Update tea_coffee.dm 2019-11-04 06:05:10 -05:00
Trilbyspaceclone
fe87eec45c i hate mob code 2019-11-04 00:58:51 -05:00
TrilbySpaceClone
526d9b203c aliens 
man
 2019-11-04 00:34:03 -05: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
Trilbyspaceclone
8a9e0dbbe3 pen b gone 2019-11-03 20:49:03 -05:00
kappa-sama
9f04cba7bf workaround 2019-11-03 18:27:47 -05:00
Ghommie
dcc81d92b5 Fixing a few throw_at calls and modular computer processors Init. 2019-11-04 00:12:41 +01:00
TrilbySpaceClone
82b148b7b7 Merge branch 'master' into Cargo_MKII 2019-11-03 17:53:06 -05:00
TrilbySpaceClone
40a47bb4e9 Merge branch 'Cargo_MKII' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into Cargo_MKII 2019-11-03 17:26:38 -05:00