shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,422 Commits 5 Branches 0 Tags
afe80d808b1c3accc1a97f5d70a4f5ea35ab0ba2
Commit Graph

10349 Commits

Author SHA1 Message Date
YPOQ
afe80d808b Fixes gorillas not having hand slots (#37762) 2018-05-10 20:52:38 -05:00
LetterJay
8948acfce2 Merge pull request #6691 from Citadel-Station-13/upstream-merge-37753 
[MIRROR] Makes the cultblade use the right inhand files
 2018-05-10 10:12:56 -05:00
LetterJay
0e27471a77 Merge pull request #6690 from Citadel-Station-13/upstream-merge-37704 
[MIRROR] Adds drone hats for some holidays
 2018-05-10 10:12:08 -05:00
LetterJay
4533b983f6 Merge pull request #6689 from Citadel-Station-13/upstream-merge-37693 
[MIRROR] Fixes singuloth not disappearing after a set amount of time.
 2018-05-10 00:49:06 -05:00
LetterJay
dd25b15115 Merge pull request #6688 from Citadel-Station-13/upstream-merge-37721 
[MIRROR] Fixes edge case with crew pinpointers
 2018-05-10 00:46:38 -05:00
Lexorion
2c33868d8a makes the cultblade use the right inhand files 2018-05-09 15:48:40 -05:00
Denton
6edd272d76 drone masks for holidays 2018-05-09 13:42:54 -05:00
Dax Dupont
b29f399157 Fixes singuloth not disappeared after a set amount of time. 2018-05-09 13:42:44 -05:00
kevinz000
566ca84c21 edge case 2018-05-09 13:41:28 -05:00
Tlaltecuhtli
51b6a296d3 fixes a money loop 
🆑 
fix: fixes a possible money exploit
/🆑

why: if you buy the barrier crate, open it, spam all the grenades in vertical mode u ll get more money that the crate is worth
before: 4 grenades -> 12 barriers * 375 credits -> 4500 + 500 (crate) + 200 (manifest) -> 5200 which is a +3200 net gain
now:  4 grenades -> 12 barriers * 100 credits -> 1200+ 500 (crate) + 200 (manifest) -> 1900 which is a -100 net loss
 2018-05-09 13:40:13 -05:00
Naksu
eb4743e5a9 every fucking time 2018-05-08 09:21:36 -05:00
deathride58
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
kevinz000
9d39b2859a Geiger counters can now scan the radiation of anything! (#37688) 2018-05-07 13:51:26 -05:00
LetterJay
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
LetterJay
893783188f Merge pull request #6672 from Citadel-Station-13/kevinz000-patch-1 
tesla coil runtime fix
 2018-05-07 09:20:42 -05:00
deathride58
be42e97101 Update helpers.dm 2018-05-07 08:47:44 -04:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
757cd6aa73 Merge pull request #6668 from Citadel-Station-13/upstream-merge-37680 
[MIRROR] Improves skittish code
 2018-05-07 12:43:47 +00:00
deathride58
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
deathride58
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
kevinz000
79d0a12884 Allows anyone to reboot on OOM situations 2018-05-07 03:07:09 -07:00
kevinz000
33e6ef93f1 runtime fix 2018-05-06 20:17:15 -07:00
deathride58
034bf6ce79 Update verbs.dm 2018-05-06 17:38:25 -04:00
deathride58
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
vuonojenmustaturska
0d7a0c0418 Merge pull request #37679 from DaxDupont/death 
Fixes rhumba beat as requested by naksu
 2018-05-06 16:38:16 -05:00
vuonojenmustaturska
4b36831fbe Merge pull request #37681 from kevinz000/patch-499 
Fixes supply pod duping
 2018-05-06 16:38:08 -05:00
vuonojenmustaturska
8e791af911 Merge pull request #37680 from kevinz000/patch-498 
Improves skittish code
 2018-05-06 16:37:57 -05:00
vuonojenmustaturska
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
ShizCalev
6415ecdbe9 Shows assemblies some love. ♥ 2018-05-06 16:37:40 -05:00
Tad Hardesty
af5e898dab Fix the top menus in the skin not working 2018-05-06 16:37:31 -05:00
81Denton
ba0dc700df Axes the robotic fabricator (not the exofab) (#37668) 
* removes robofab

* that too
 2018-05-06 16:37:22 -05:00
Jordan Brown
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
Jordan Brown
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
deathride58
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
deathride58
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
81Denton
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
kevinz000
6669328929 alt morph nerf (#37654) 2018-05-05 14:54:06 -05:00
LetterJay
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
LetterJay
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
LetterJay
4dd07fe4e7 Merge pull request #6641 from Citadel-Station-13/upstream-merge-37447 
[MIRROR] Fixes mousetraps not going off from being dumped out
 2018-05-05 09:38:11 -05:00
LetterJay
889716fbd6 Merge pull request #6645 from Citadel-Station-13/upstream-merge-37640 
[MIRROR] Lengthen commit hashes in Show Server Revision
 2018-05-05 09:35:31 -05:00
CitadelStationBot
bdd613fa05 Merge pull request #6650 from Citadel-Station-13/upstream-merge-37659 
[MIRROR] Crayons no longer use charge when used on a canvas
 2018-05-05 09:35:01 -05:00
Jordan Brown
7104f28ed8 Merge pull request #37651 from 81Denton/donksoft-board 
Adds missing donksoft vendor board to illegal tech node
 2018-05-05 08:11:04 -05:00
Jordan Brown
6a940a7149 Merge pull request #37641 from AutomaticFrenzy/patch/tooltip-jquery 
Use bundled rather than remote jquery in tooltips
 2018-05-05 08:10:54 -05:00
LetterJay
bf42b89677 Merge pull request #6634 from Citadel-Station-13/upstream-merge-37625 
[MIRROR] Updates infrared emitters to use the rotate component
 2018-05-04 23:22:36 -05:00
LetterJay
65cd679e86 Merge pull request #6644 from Citadel-Station-13/upstream-merge-37657 
[MIRROR] Fixes Tequila Sunrise naming
 2018-05-04 23:20:00 -05:00