shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,595 Commits 5 Branches 0 Tags
2eb7872a6af08506d62bb3bf24d117be5b3e97df
Commit Graph

1182 Commits

Author SHA1 Message Date
LetterJay
2eb7872a6a Merge pull request #1285 from Citadel-Station-13/upstream-merge-27782 
[MIRROR] Adds coalesce to world.internet_address
 2017-06-05 02:12:56 -05:00
LetterJay
803f7a46c4 magic SQL shit 2017-06-05 01:56:23 -05:00
CitadelStationBot
94405f5176 Lowers supermatter damage hardcap by 75% to compensate for high speed atmos processing (#1363) 2017-06-04 09:10:35 -07:00
CitadelStationBot
e0b5221ebd The Crafting Menu now has subcategories! (#1364) 2017-06-04 09:09:59 -07:00
CitadelStationBot
159f78efe7 Fixes #27989 : Riot suits no longer hide jumpsuits (#1379) 2017-06-04 09:09:03 -07:00
CitadelStationBot
b5d2cf3c99 [READY] Stacks will change item_states and w_class based on how full they are. (#1370) 2017-06-04 09:08:33 -07:00
CitadelStationBot
4ac745a275 the man with the 2 shotguns that blasted me to the end of the world with dualwielding. nerf (#1375) 2017-06-04 09:08:19 -07:00
CitadelStationBot
c1adecc0e2 Fix AI status displays to use a list instead of the world list (#1391) 2017-06-04 09:08:04 -07:00
CitadelStationBot
bfe11f8540 Fixes #27979 : Bulldog shotguns update properly when their magazine is removed. (#1377) 2017-06-04 09:07:36 -07:00
CitadelStationBot
63f9657d9b Refactors a cooldown var to not require a spawn or sleep (#1381) 2017-06-04 09:06:47 -07:00
CitadelStationBot
ae1e159673 Remove a commented out function (#1389) 2017-06-04 09:06:02 -07:00
CitadelStationBot
c77607e411 This doesn't do anything (#1390) 2017-06-04 09:05:28 -07:00
CitadelStationBot
1c1cbe8e5b Refactor another spawn var (#1395) 2017-06-04 09:04:56 -07:00
CitadelStationBot
9f02ba1245 Refactors another spawn cooldown var (#1393) 2017-06-04 09:04:49 -07:00
CitadelStationBot
0455bf5f9a we have to move forward with grammar fixes (#1397) 2017-06-04 09:04:03 -07:00
CitadelStationBot
c36e599a6a Fixes AOE modkits not working because I messed up the logic (#1400) 2017-06-04 09:03:45 -07:00
CitadelStationBot
eeda9fd77f Proposal: typed map variables (#1398) 2017-06-04 09:03:38 -07:00
CitadelStationBot
e59e7f8d06 Fixes bsa not showing up (#1396) 2017-06-04 09:03:30 -07:00
CitadelStationBot
13767b91ad Fixes admiral recall (#1374) 2017-06-04 02:18:42 -07:00
CitadelStationBot
c82c71a6c1 Removes poison pen. (#1295) 2017-06-03 06:39:23 -07:00
CitadelStationBot
f8505883d4 Removes dragoontomb ruin and loot. (#1290) 2017-06-03 06:39:11 -07:00
CitadelStationBot
32c288dfc8 Gives the pod people's dispenser all the chemicals they could ever want. (#1357) 2017-06-03 06:36:34 -07:00
CitadelStationBot
4a84f13ed0 Revert "[s]Revert "Revert "Revert "Revert "Revert "Revert "Typos in syndicate uplink descriptions""""""" (#1359) 2017-06-03 06:35:03 -07:00
CitadelStationBot
dfcd326337 [MIRROR] Typos in syndicate uplink descriptions (#1341) 
* Typos in syndicate uplink descriptions

* Delete uplink_item.dm.rej
 2017-06-03 06:28:48 -07:00
CitadelStationBot
263b79b299 [MIRROR] Individual logs are no longer lost with mob changes (#1249) 
* Individual logs are no longer lost with mob changes

* Delete mob_defines.dm.rej
 2017-06-02 22:01:58 -07:00
CitadelStationBot
d74b8d187a Binary talk now logs in the individual logging (#1335) 2017-06-02 22:01:15 -07:00
LetterJay
976c1244dd Config shit for cards (#1310) 2017-06-02 21:56:08 -07:00
CitadelStationBot
b85384c0ad Fixes meteor and immoveable rods hitting Centcomm (#1252) 2017-06-02 21:36:45 -07:00
CitadelStationBot
9873fe0957 Buffs nitrous oxide (#1339) 2017-06-02 21:22:08 -07:00
CitadelStationBot
dbc902ef29 Fixes martial arts resetting on cloning. (#1338) 2017-06-02 21:21:47 -07:00
CitadelStationBot
264cbf040b Revert "Revert "Revert "Revert "Typos in syndicate uplink descriptions"""" (#1350) 2017-06-02 21:16:56 -07:00
LetterJay
1dfe9eca9a Merge pull request #1332 from Citadel-Station-13/upstream-merge-27906 
[MIRROR] Adds three unique kinetic accelerator modules to necropolis chests
 2017-06-02 22:47:30 -05:00
LetterJay
f3f0ab5d37 Merge pull request #1345 from Citadel-Station-13/upstream-merge-27921 
[MIRROR] Fix cable coil dupe and APC icon oddity
 2017-06-02 22:46:19 -05:00
LetterJay
dacbbedec8 Merge pull request #1326 from Citadel-Station-13/upstream-merge-27894 
[MIRROR] Lowers portable pump max pressure to 1013.25
 2017-06-02 22:44:41 -05:00
LetterJay
9b64f18e0e Merge pull request #1324 from Citadel-Station-13/upstream-merge-27880 
[MIRROR] Borg module resets now require cutting instead of pulsing the reset wire
 2017-06-02 22:40:49 -05:00
LetterJay
b5cfa6709e Merge pull request #1322 from Citadel-Station-13/upstream-merge-27877 
[MIRROR] Advanced proccall now supports /proc/PROCNAME
 2017-06-02 22:40:07 -05:00
CitadelStationBot
48c439aaac Fix cable coil dupe and APC icon oddity 2017-06-02 14:11:29 -05:00
CitadelStationBot
cb755fc6d0 Adds three unique kinetic accelerator modules to necropolis chests 2017-06-01 15:32:16 -05:00
CitadelStationBot
fc2f45b71b Lowers portable pump max pressure to 1013.25 2017-05-31 23:14:26 -05:00
CitadelStationBot
ac23b06edd Borg module resets now require cutting instead of pulsing the reset wire 2017-05-31 19:56:43 -05:00
CitadelStationBot
538bce59a6 Advanced proccall now supports /proc/PROCNAME 2017-05-31 19:24:13 -05:00
CitadelStationBot
b78f317f2d Adds repair and lavaland map generator templates for buildmode use 2017-05-31 12:57:22 -05:00
LetterJay
46bcc34a0e Merge pull request #1214 from Citadel-Station-13/upstream-merge-27677 
[MIRROR] Adds marker beacons to miner borgs
 2017-05-31 01:53:38 -05:00
LetterJay
4654baea3b Merge pull request #1217 from Citadel-Station-13/upstream-merge-27685 
[MIRROR] Fixes delayed login message
 2017-05-31 01:48:42 -05:00
LetterJay
b19115e10f Merge branch 'master' into upstream-merge-27454 2017-05-30 23:48:25 -05:00
LetterJay
fbbceadc6e Merge branch 'master' into AllMapChangesInOne 2017-05-30 23:08:32 -05:00
LetterJay
9b00499d24 It's been a long night 2017-05-30 22:41:22 -05:00
LetterJay
8f06db65c9 Merge pull request #1131 from Citadel-Station-13/upstream-merge-27534 
[MIRROR] Replaced mob spawner vars with outfits
 2017-05-30 21:43:31 -05:00
LetterJay
1763c4b65d Merge pull request #1114 from Citadel-Station-13/upstream-merge-27530 
[MIRROR] Area Refactor + Var-edit Cleanup
 2017-05-30 20:49:42 -05:00
LetterJay
adb7a9b6ff rej clean up 
more areas
 2017-05-30 20:08:53 -05:00