shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,407 Commits 5 Branches 0 Tags
1a25c685a178a1ae0950bc1c23f718d67289d0ed
Commit Graph
16407 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jordan Brownandletterjay 1a25c685a1 Update DMAPI to version 3.2.1.0 2018-05-08 21:33:58 -05:00
LetterJayandGitHub 3d0ae0255b Merge pull request #6677 from Citadel-Station-13/upstream-merge-37745 
[MIRROR] Removes fusion, again
 2018-05-08 09:30:31 -05:00
letterjay c64faefec3 Removes fusion, again 2018-05-08 09:21:36 -05:00
Naksuandletterjay eb4743e5a9 every fucking time 2018-05-08 09:21:36 -05:00
deathride58andGitHub 37d65a54ff Merge pull request #6666 from Citadel-Station-13/upstream-merge-37632 
[MIRROR] Shows assemblies some love. ♥
 2018-05-07 19:41:21 +00:00
deathride58andGitHub 0f3475680c Merge pull request #6674 from Citadel-Station-13/upstream-merge-37688 
[MIRROR] Geiger counters can now scan items
 2018-05-07 19:40:44 +00:00
letterjay 6b1bf38dc1 Geiger counters can now scan items 2018-05-07 13:51:26 -05:00
kevinz000andletterjay 9d39b2859a Geiger counters can now scan the radiation of anything! (#37688) 2018-05-07 13:51:26 -05:00
LetterJayandGitHub 5d18d53566 Merge pull request #6673 from Citadel-Station-13/kevinz000-patch-2 
Allows anyone to reboot on OOM situations
 2018-05-07 09:20:59 -05:00
LetterJayandGitHub 893783188f Merge pull request #6672 from Citadel-Station-13/kevinz000-patch-1 
tesla coil runtime fix
 2018-05-07 09:20:42 -05:00
deathride58andGitHub be42e97101 Update helpers.dm 2018-05-07 08:47:44 -04:00
deathride58andGitHub 5d38c10581 Merge pull request #6661 from Citadel-Station-13/upstream-merge-37712 
[MIRROR] Fixes a radiation runtime related to going off the map edge
 2018-05-07 12:46:00 +00:00
deathride58andGitHub f15f3ffea4 Merge pull request #6662 from Citadel-Station-13/upstream-merge-37648 
[MIRROR] Moves removing the cell to screwdriver_act for APCs
 2018-05-07 12:45:42 +00:00
deathride58andGitHub e3ad766f33 Merge pull request #6664 from Citadel-Station-13/upstream-merge-37668 
[MIRROR] Axes the robotic fabricator (not the exofab)
 2018-05-07 12:45:09 +00:00
deathride58andGitHub 9b7518e1e2 Merge pull request #6665 from Citadel-Station-13/upstream-merge-37578 
[MIRROR] Fix the top menus in the skin not working
 2018-05-07 12:44:35 +00:00
deathride58andGitHub 8bc97a10d6 Merge pull request #6667 from Citadel-Station-13/upstream-merge-37676 
[MIRROR] Prevents electric grills from mass producing lightning through exploits
 2018-05-07 12:44:12 +00:00
deathride58andGitHub 757cd6aa73 Merge pull request #6668 from Citadel-Station-13/upstream-merge-37680 
[MIRROR] Improves skittish code
 2018-05-07 12:43:47 +00:00
deathride58andGitHub d897dd5182 Merge pull request #6669 from Citadel-Station-13/upstream-merge-37681 
[MIRROR] Fixes supply pod duping
 2018-05-07 12:43:16 +00:00
deathride58andGitHub ab07f4a878 Merge pull request #6670 from Citadel-Station-13/upstream-merge-37679 
[MIRROR] Fixes rhumba beat as requested by naksu
 2018-05-07 12:42:57 +00:00
deathride58andGitHub 0c6c4d9c1d Merge pull request #6671 from Citadel-Station-13/upstream-merge-37468 
[MIRROR] Makes it plausible for the lone operative event to roll if the nuclear disk stays still for long enough
 2018-05-07 12:42:30 +00:00
kevinz000andGitHub 79d0a12884 Allows anyone to reboot on OOM situations 2018-05-07 03:07:09 -07:00
kevinz000andGitHub 33e6ef93f1 runtime fix 2018-05-06 20:17:15 -07:00
deathride58andGitHub 034bf6ce79 Update verbs.dm 2018-05-06 17:38:25 -04:00
CitadelStationBot 31a7783b90 Makes it plausible for the lone operative event to roll if the nuclear disk stays still for long enough 2018-05-06 16:38:25 -05:00
deathride58andCitadelStationBot 06fc24e953 Makes it plausible for the lone operative event to roll if the nuclear disk stays still for long enough (#37468) 
* makes it possible for the lone operative event to roll if the nuclear disk stays still for long enough

* makes the event weight increase chance reset if the disk moves

* slows this shit *WAY* down, adds a minimum time for the weight to start rolling for an increase (approximately 10 minutes)

* .

* this was an absolute pain in the ass to test - addresses reviews

* addresses ninjanomnom's review, makes it possible for the loneop event weight to decrease if the disk moves
 2018-05-06 16:38:25 -05:00
CitadelStationBot bf0bed7326 Fixes rhumba beat as requested by naksu 2018-05-06 16:38:16 -05:00
vuonojenmustaturskaandCitadelStationBot 0d7a0c0418 Merge pull request #37679 from DaxDupont/death 
Fixes rhumba beat as requested by naksu
 2018-05-06 16:38:16 -05:00
CitadelStationBot d71e920ac1 Fixes supply pod duping 2018-05-06 16:38:08 -05:00
vuonojenmustaturskaandCitadelStationBot 4b36831fbe Merge pull request #37681 from kevinz000/patch-499 
Fixes supply pod duping
 2018-05-06 16:38:08 -05:00
CitadelStationBot 21b46a5d7b Improves skittish code 2018-05-06 16:37:57 -05:00
vuonojenmustaturskaandCitadelStationBot 8e791af911 Merge pull request #37680 from kevinz000/patch-498 
Improves skittish code
 2018-05-06 16:37:57 -05:00
CitadelStationBot 6a198d40b9 Prevents electric grills from mass producing lightning through exploits 2018-05-06 16:37:49 -05:00
vuonojenmustaturskaandCitadelStationBot ed41503127 Merge pull request #37676 from AverageJoe82/electric-grill-engine 
Prevents electric grills from mass producing lightning through exploits
 2018-05-06 16:37:49 -05:00
ShizCalevandCitadelStationBot 6415ecdbe9 Shows assemblies some love. ♥ 2018-05-06 16:37:40 -05:00
Tad HardestyandCitadelStationBot af5e898dab Fix the top menus in the skin not working 2018-05-06 16:37:31 -05:00
CitadelStationBot af5f1ec040 Axes the robotic fabricator (not the exofab) 2018-05-06 16:37:22 -05:00
81DentonandCitadelStationBot ba0dc700df Axes the robotic fabricator (not the exofab) (#37668) 
* removes robofab

* that too
 2018-05-06 16:37:22 -05:00
CitadelStationBot 10d6681463 Moves removing the cell to screwdriver_act for APCs 2018-05-06 16:37:04 -05:00
Jordan BrownandCitadelStationBot 81deaaca6d Merge pull request #37648 from vuonojenmustaturska/apcunsmash 
Moves removing the cell to screwdriver_act for APCs
 2018-05-06 16:37:04 -05:00
CitadelStationBot 0393fa91ec Fixes a radiation runtime related to going off the map edge 2018-05-06 16:36:55 -05:00
Jordan BrownandCitadelStationBot 56e9fcd29c Merge pull request #37712 from ninjanomnom/dont-step-off-the-edge 
Fixes a radiation runtime related to going off the map edge
 2018-05-06 16:36:54 -05:00
deathride58andGitHub 11c1e8fbf7 Merge pull request #6632 from Citadel-Station-13/upstream-merge-37620 
[MIRROR] Remove a leftover reference to the gang dominator
 2018-05-06 07:03:37 +00:00
deathride58andGitHub 50eae25c92 Merge pull request #6656 from Citadel-Station-13/upstream-merge-37654 
[MIRROR] Morphs can no longer eat or attack while disguised
 2018-05-06 07:02:39 +00:00
deathride58andGitHub 16ad31516c Merge pull request #6658 from Citadel-Station-13/upstream-merge-37647 
[MIRROR] Adds desc to vendor circuit board
 2018-05-06 07:02:17 +00:00
CitadelStationBot e6b04e5f24 Adds desc to vendor circuit board 2018-05-05 17:54:55 -05:00
81DentonandCitadelStationBot d44b1b9b2e Adds desc to vendor circuit board (#37647) 
* FEED ME A STRAY CAT

* forgive me for I have web edited

* AAAAAHH
 2018-05-05 17:54:54 -05:00
CitadelStationBot 9659062dc2 Morphs can no longer eat or attack while disguised 2018-05-05 14:54:07 -05:00
kevinz000andCitadelStationBot 6669328929 alt morph nerf (#37654) 2018-05-05 14:54:06 -05:00
LetterJayandGitHub bf66827936 Merge pull request #6652 from Citadel-Station-13/upstream-merge-37641 
[MIRROR] Use bundled rather than remote jquery in tooltips
 2018-05-05 09:44:39 -05:00
LetterJayandGitHub f387bb1694 Merge pull request #6633 from Citadel-Station-13/upstream-merge-37622 
[MIRROR] Changes cockroach guts to insect guts
 2018-05-05 09:40:11 -05:00