shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,039 Commits 5 Branches 0 Tags
b61269c7e24cc11e5586f4e1a70710fff60cfd75
Commit Graph

1459 Commits

Author SHA1 Message Date
kevinz000 6eac97524f compile 2020-01-27 22:42:48 -07:00
kevinz000 b742229539 Update pool.dm 2020-01-27 22:20:10 -07:00
kevinz000 ebff6c9f38 compile, jump board crash to ground 2020-01-25 17:25:15 -07:00
kevinz000 19f1eba015 renames 2020-01-25 17:13:11 -07:00
kevinz000 443f1716e1 Merge remote-tracking branch 'citadel/master' into the-p-o-o-l 2020-01-25 17:04:37 -07:00
kevinz000 ec69b9de4d changes 2020-01-25 17:04:07 -07:00
Ghom 00667eeecd Merge pull request #10698 from Putnam3145/ghost-dojo-ban 
Made ghost cafe mobs dust upon leaving, allowed ghost cafe bans
 2020-01-25 15:25:26 +01:00
kevinz000 ac6695bd68 Merge pull request #10679 from Ghommie/Ghommie-cit517 
neuter/plural gender fixes.
 2020-01-24 16:15:44 -07:00
Ghom d5daae98c7 Merge pull request #9905 from Trilbyspaceclone/glassware 
[Ready] Cargo MK III - Glassware Addtion
 2020-01-24 18:46:25 +01:00
Putnam 0493db0ac6 allowed dojo banning, made dojo mobs dust upon leaving 2020-01-24 09:11:33 -08:00
kevinz000 831ac91917 Merge pull request #10073 from Ghommie/Ghommie-cit435 
Ports timestop and sepia extracts improvements/tweaks.
 2020-01-24 00:25:53 -07:00
Ghommie 3211ed6d10 Better position. 2020-01-23 23:19:39 +01:00
Ghommie 56d31b0c8c neuter/plural gender fixes. 2020-01-23 22:50:30 +01:00
Trilbyspaceclone 9466b0f4ca Merge branch 'master' into glassware 2020-01-23 13:31:04 -05:00
kevinz000 1b7265d8c1 Merge pull request #10605 from r4d6/Layer 
Port TG Layers updates and Freezer update
 2020-01-23 04:46:52 -07:00
kevinz000 70c9a9a25f logic 2020-01-22 16:36:44 -07:00
kevinz000 5d485a95c3 Merge remote-tracking branch 'citadel/master' into the-p-o-o-l 2020-01-19 20:25:51 -07:00
kevinz000 65eaf9787a Merge pull request #10097 from Ghommie/Ghommie-cit444 
Made traitor kevlar/armor padding accessories examine-proof.
 2020-01-19 16:58:27 -07:00
kevinz000 90fcb4cc14 initial changes 2020-01-19 16:13:05 -07:00
r4d6 5084146400 Port 2020-01-18 18:46:22 -05:00
Ghommie 072eca6ec0 fixes and more PRs 2020-01-18 23:01:00 +01:00
Ghommie 3ee855ab77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 22:14:06 +01:00
Ghommie 224146ee1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit444 2020-01-18 03:36:09 +01:00
Ghommie 9c0b78bc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 01:23:08 +01:00
Ghommie eaff51ff40 Kevinz let some files fall back to CRLF. 2020-01-17 23:26:05 +01:00
kevinz000 aea0de30d1 Merge pull request #10125 from Ghommie/Ghommie-cit449 
Ports a few projectile code updates by ke:b:inz.
 2020-01-17 15:15:08 -07:00
keronshb 69b5164103 Merge branch 'master' into RemoteMoodResearch 2020-01-16 15:50:11 -05:00
Ghom ca13be3c92 Merge pull request #10456 from Putnam3145/arousal-bad 
Removes arousal damage and replaces it with simpler systems
 2020-01-16 13:30:31 +01:00
Putnam 253a3a44ba moved "aphro" magic string to a define 2020-01-15 20:15:40 -08:00
Ghom 7d9f4f9fe5 Merge pull request #10417 from kevinz000/nightshift_1 
Nightshift improvements: public area settings/levels, nightshift auth requirement change, config changes, etc etc
 2020-01-16 03:21:49 +01:00
Putnam d29603ad77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-15 15:57:32 -08:00
Ghom 31c3b0f7bb Merge pull request #10415 from kevinz000/tg_update_1 
Small controller/backend updates from /tg/
 2020-01-15 15:23:09 +01:00
Detective Google 2c4daf3a99 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l 2020-01-13 16:32:18 -06:00
TrilbySpaceClone 92dc5e61c3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware 2020-01-13 03:42:20 -05:00
kevinz000 884ea59d63 fix logic 2020-01-12 18:38:22 -08:00
kevinz000 8f5d4a0a49 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-12 18:27:03 -08:00
Ghommie f45f979c27 Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 2020-01-12 23:21:03 +01:00
Detective Google f6c5f81a83 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l 2020-01-12 15:16:17 -06:00
Ghommie c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
Ghommie 02fbbd4f95 Ouch. 2020-01-12 16:54:08 +01:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kevinz000 60524fb9c7 Merge pull request #10416 from r4d6/RCD-Updates 
Massive RCD Port & Updates
 2020-01-12 00:45:21 -08:00
Detective Google d5b227a0ca adds the POOL to box station 
F in chat for dorms 7.
 2020-01-11 23:34:07 -06:00
Seris02 29b66db9e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into explosionport 2020-01-11 11:29:30 +08:00
Seris02 0b0b80f174 explosions 2020-01-11 11:22:59 +08:00
Putnam 48fadffbfb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-10 17:57:03 -08:00
kevinz000 8725ffe916 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-10 06:12:59 -08:00
Lin c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447 
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
 2020-01-10 01:31:20 +00:00
Putnam 244d46ee41 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-08 17:08:01 -08:00
Putnam cd35e516ac back by popular demand: maso/nympho 2020-01-07 17:01:14 -08:00