shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,885 Commits 5 Branches 0 Tags
b0c94deff3e15a76743afef26c58f309d44a81b2
Commit Graph

74 Commits

Author SHA1 Message Date
CitadelStationBot cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
CitadelStationBot c85e409872 [MIRROR] Removes the multiverse and its sword (#2573) 
* Merge pull request #30283 from pubby/multiverse

Removes the multiverse and its sword

* Removes the multiverse and its sword
 2017-09-22 20:23:56 -05:00
kevinz000 5591afc9ce double wew 2017-08-29 09:53:11 -07:00
CitadelStationBot 2d4bd6f6f0 Fixes survival_pods being a valid_territory for gangs sprays & dominations/blob takeovers/cult summons/ect 2017-08-28 02:20:30 -05:00
LetterJay 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000 35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000 6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
CitadelStationBot 87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00
CitadelStationBot a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot f893863397 [MIRROR] Refactors speech/communication logging and adds coordinates to speech logs (#1905) 
* Refactors speech/communication logging and adds coordinates to speech logs

* Update clockwork_slab.dm

* Delete clockwork_slab.dm.rej

* Update browserOutput.dm

* Delete browserOutput.dm.rej
 2017-07-13 06:37:51 -07:00
CitadelStationBot ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot 90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
Poojawa b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
LetterJay 5571cca37c .rej cleanup 2017-06-26 06:14:42 -05:00
LetterJay 42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
LetterJay a544d99f9f cleanup and commits 2017-06-19 12:35:05 -05:00
LetterJay 55e565ab8c upstream-merge-27973 2017-06-11 02:16:35 -05:00
LetterJay 7fa05ca854 Merge pull request #1489 from Citadel-Station-13/upstream-merge-27960 
[MIRROR] [READY] Gang Points Refactor - Now stored in the gang datum
 2017-06-09 09:37:58 -05:00
CitadelStationBot 99ac851f46 Gang - Purchasing the improvised shotgun actually spawns a gun. 2017-06-09 03:42:22 -05:00
CitadelStationBot d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
CitadelStationBot 1658e48bc1 [READY] Gang Points Refactor - Now stored in the gang datum 2017-06-08 14:46:07 -05:00
CitadelStationBot 5b53514452 Hulks now take 10 hits to destroy dominators up from 2 2017-06-06 10:40:10 -05:00
LetterJay b2d288d1f8 Merge pull request #1225 from Citadel-Station-13/upstream-merge-27611 
[MIRROR] Gang War: Replaces sniper rifle with weaker version, nonlethal ammo, tweaks bling value
 2017-06-05 23:06:18 -05:00
CitadelStationBot 11d5262e0c Dominator colors are now directly determined by the gang's color (#1355) 2017-06-03 06:36:49 -07:00
LetterJay b19115e10f Merge branch 'master' into upstream-merge-27454 2017-05-30 23:48:25 -05:00
LetterJay 29da073bb9 Merge pull request #1284 from Citadel-Station-13/upstream-merge-27840 
[MIRROR] Fixes doubled post-round end time.
 2017-05-30 18:40:54 -05:00
LetterJay c81dc599e3 Merge pull request #1174 from Citadel-Station-13/upstream-merge-27414 
[MIRROR] 4th Attempt at 60% shuttle recall gang murderbone thing
 2017-05-30 16:04:41 -05:00
LetterJay bc5ecc91b5 rej clean 2017-05-30 15:55:00 -05:00
LetterJay a38973ece8 commit 2017-05-30 15:44:41 -05:00
LetterJay c28818b893 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27414 2017-05-30 15:29:24 -05:00
LetterJay b2afc61f54 cyka 2017-05-30 14:18:32 -05:00
LetterJay 80896d0371 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27675 2017-05-30 14:14:25 -05:00
LetterJay 750baf3dca multi level 2017-05-29 02:15:26 -05:00
LetterJay aefca24012 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27697 2017-05-29 02:12:41 -05:00
CitadelStationBot f89d732d0a Removes duplicate sharpener from gang uplink 2017-05-28 08:16:35 -05:00
CitadelStationBot 29c15fe9fd Centcomm is on Z1 2017-05-27 20:57:26 -05:00
kevinz000 b4cd9de3e4 newline errors 2017-05-27 13:39:06 -07:00
CitadelStationBot 7b820cf7ca Fixes missing bracket in domi spawner message (#1234) 2017-05-27 13:32:11 -07:00
CitadelStationBot c3d2dbe00a Gang War: Replaces sniper rifle with weaker version, nonlethal ammo, tweaks bling value 2017-05-27 09:27:00 -05:00
CitadelStationBot 83b4c1d8d4 Adds round table to replace tacking some data in feedback table 2017-05-26 15:18:16 -05:00
CitadelStationBot 2fadc0e58b Fixes Gang War's infinity shuttle 2017-05-26 11:27:38 -05:00
CitadelStationBot 9eb32eb6b7 4th Attempt at 60% shuttle recall gang murderbone thing 2017-05-24 19:21:52 -05:00
LetterJay b633ef0991 Merge pull request #1130 from Citadel-Station-13/GangSync 
Syncs all gang related PRs with upstream
 2017-05-23 06:17:29 -05:00
LetterJay b85d2ea321 Syncs all gang related PRs with upstream 2017-05-23 06:10:40 -05:00
LetterJay cbae09b538 rej cleanup/commit 2017-05-22 16:59:39 -05:00
LetterJay d200bff9f4 spaces. spaces caused the file to conflict. 2017-05-22 11:26:47 -05:00
CitadelStationBot c39b60b3cf Decentralized and Vastly Improved Gang Influence System 2017-05-20 18:37:48 -05:00
CitadelStationBot 3f35592f4e Gang mode sync (#933) 
* Revert "Gang mode now calls a 4 minute shuttle once 60% of the crew is dead"

* gang fixes

* gang modernizations
 2017-05-18 11:33:37 -05:00
Poojawa 7a2560ee76 Delete gang_items.dm.rej 2017-05-18 08:07:48 -05:00