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

630 Commits

Author SHA1 Message Date
kevinz000
21775ad3ee Merge pull request #9813 from Ghommie/Ghommie-cit355 
Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]"
 2019-11-16 01:24:58 -07:00
Putnam
4f06a25951 Made staff of change require/cost threat 2019-11-14 23:26:59 -08:00
Putnam
f3c4897b48 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-14 22:31:48 -08:00
kevinz000
178aedc5cc Merge pull request #9754 from Ghommie/Ghommie-cit330 
porting "global to static"
 2019-11-14 16:38:27 -07:00
kevinz000
2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290 
Purging a lot of space indention in favor of tabs.
 2019-11-14 15:55:04 -07:00
kevinz000
af0962088c Merge pull request #9453 from Ghommie/Ghommie-cit226 
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
 2019-11-14 15:47:18 -07:00
Ghommie
98bc6d6c60 Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]" 2019-11-14 23:33:37 +01:00
Putnam
6d8f2b8914 Made s?laughter demon and apprentice cost threat, too. 2019-11-14 06:42:13 -08:00
Putnam
28a14fd01e Removed janky nuke disk threat increase 2019-11-14 05:57:56 -08:00
Putnam
304ce37d6c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-14 02:23:48 -08:00
kevinz000
3015ec5c04 Merge pull request #9764 from Ghommie/Ghommie-cit335 
Dreamchecker compatibility changes, part 1.
 2019-11-14 01:37:41 -07:00
Putnam
ad84b2977a this might help with the disk weirdness 2019-11-13 19:14:42 -08:00
Putnam
5e51cc63f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-13 16:58:44 -08:00
kevinz000
18993c735a Merge pull request #9771 from Ghommie/Ghommie-cit338 
Porting Robustin's Syndicate Infiltrator PR from tee-gee
 2019-11-12 23:58:46 -07:00
Ghommie
2b8b8882fb You are actually rifght, that's bad. 2019-11-12 15:49:20 +01:00
Ghommie
a18bcd05d7 makes it compile. 2019-11-12 02:38:45 +01:00
Ghommie
388a7579b9 A few minor clock cult improvements. 2019-11-12 01:49:36 +01:00
Ghommie
42d9e3cf51 Porting Robustin's Syndicate Infiltrator PR 2019-11-11 18:49:18 +01:00
Putnam
2120526525 Merged upstream dynamic fixes ported by Ghommie. 2019-11-10 18:48:59 -08:00
Ghommie
4c1eba0d81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226 2019-11-10 23:52:48 +01:00
Ghommie
e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +01:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
kevinz000
1493863533 Merge pull request #9716 from Ghommie/Ghommie-cit317 
Porting objective code refactor (ergo fixing abductors/abductees objective by updating the code)
 2019-11-10 11:27:04 -07:00
Ghommie
c6e44a7fed That's it: #46027, (a little bit of) #46132, #47100, #47341, #47351, #47395, #47457, #47491. 2019-11-10 17:59:40 +01:00
Ghommie
9591bb5471 porting "global to static" 2019-11-09 22:53:56 +01:00
Putnam
fdcc4af303 mm, yes, compile BEFORE committing 2019-11-09 04:40:25 -08:00
Putnam
6de835f5e3 Assassination is less likely at lower threats. 2019-11-09 04:39:14 -08:00
Putnam
428ea5e5e1 Nuke disk being still now generates threat 2019-11-09 03:12:36 -08:00
Putnam
d0d469a45a Better roundend logging 2019-11-09 01:00:35 -08:00
Putnam
cfcf89ebf1 Dynamic controls lots of events now (when active)! 2019-11-08 15:44:38 -08:00
Putnam
825ef80b9d started transferring some events from events to dynamic antags 2019-11-08 06:33:31 -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
Putnam
58603140f9 wow, .len, very cool 2019-11-06 22:03:18 -08: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
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
Ghommie
a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Ghommie
8c31c1036d Porting objective code refactor 2019-11-04 22:05:04 +01:00
Ghommie
6cf35a67b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-10-31 23:17:39 +01:00
kevinz000
6dc6159f4a Merge pull request #9578 from deathride58/mapsubsystemimprovements 
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
 2019-10-29 21:42:32 -07:00
kevinz000
631961121f Merge pull request #9521 from MrJWhit/cult-robe-change 
Increases bomb resistance in blood cult robes
 2019-10-29 21:38:00 -07:00
kevinz000
ae4aee794e Merge pull request #9592 from Ghommie/Ghommie-cit262 
Porting movespeed modification system updates.
 2019-10-29 21:27:53 -07:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01: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
kevinz000
daf4acbceb Merge pull request #9599 from Ghommie/Ghommie-cit264 
Ports "New Revenant icons"
 2019-10-25 20:13:05 -07:00
Ghommie
cb74be29ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262 2019-10-25 12:40:50 +02:00
kevinz000
da502aa31d Merge pull request #9535 from Ghommie/Ghommie-cit247 
Fixing sniper rifles scope datum action oddity.
 2019-10-24 19:05:25 -07:00
kevinz000
2ae111eaf0 Merge pull request #9587 from Ghommie/Ghommie-cit258 
Porting components updates and fixing phantom thief component.
 2019-10-24 18:38:39 -07:00