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

6141 Commits

Author SHA1 Message Date
deathride58
b38424653c Merge pull request #6703 from Citadel-Station-13/upstream-merge-37656 
[MIRROR] Fixes EMPs not working on people/backpacks/other storage being carried on people
 2018-05-11 03:36:01 +00:00
deathride58
f2e7c305a5 Merge pull request #6709 from Citadel-Station-13/upstream-merge-37748 
[MIRROR] brings gender equality on /tg/station
 2018-05-11 03:33:57 +00:00
YPOQ
afe80d808b Fixes gorillas not having hand slots (#37762) 2018-05-10 20:52:38 -05:00
Tlaltecuhtli
4a8df6a701 Bring gender equality to Corgi crates (#37748) 
* brings gender equality on /tg/station
* what if this works
 2018-05-10 19:57:20 -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
kevinz000
3819a5a9b5 Fixes EMPs (#37656) 2018-05-10 01:33:25 -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
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
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
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
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
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
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
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
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
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
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
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
LetterJay
24776123f0 Merge pull request #6637 from Citadel-Station-13/upstream-merge-37636 
[MIRROR] constant chip fix
 2018-05-04 22:59:57 -05:00
LetterJay
db6f0727d2 Merge pull request #6638 from Citadel-Station-13/upstream-merge-37451 
[MIRROR] slighty upgrades the medbeam
 2018-05-04 22:58:40 -05:00
LetterJay
908394f1e2 Merge pull request #6640 from Citadel-Station-13/upstream-merge-37432 
[MIRROR] Fixes Several Machines Materials Insertion
 2018-05-04 22:57:32 -05:00
LetterJay
0c5912c834 Merge pull request #6635 from Citadel-Station-13/upstream-merge-37626 
[MIRROR] You can no longer print infinite ammunition.
 2018-05-04 22:54:00 -05:00
LetterJay
4f3f344369 Merge pull request #6643 from Citadel-Station-13/upstream-merge-37637 
[MIRROR] fixes a sentence ot spelled correctly.
 2018-05-04 22:52:32 -05:00
LetterJay
354371fcfc Merge pull request #6631 from Citadel-Station-13/upstream-merge-37621 
[MIRROR] Corrects brainwashing surgery program category
 2018-05-04 22:51:58 -05:00
PoeticIron
66f05776e6 Fixes Tequila Sunrise naming (#37657) 
Changes 'tequila Sunrise' to 'Tequila Sunrise' as per Issue #37652
(https://github.com/tgstation/tgstation/issues/37652)
 2018-05-04 06:50:43 -05:00
Armhulen
a00364268e ot dealing with bad grammar today (#37637) 2018-05-04 06:50:34 -05:00
kevinz000
4a7fae664e Fixes mousetraps not going off from being dumped out (#37447) 
* mousetrap fix

* fix mousetraps

* Update storage.dm

* Combine checks
 2018-05-04 04:43:12 -05:00
Fox McCloud
f5031bc4f7 Fixes Several Machines Materials Insertion (#37432) 
* Fixes Several Machines Materials Insertion

* attackby disable and show on examine fix
 2018-05-04 04:40:56 -05:00
Tlaltecuhtli
9533779be7 slighty upgrades the medbeam (#37451) 
🆑
tweak: medbeams heal tox and oxy slighty
/🆑
why: because some dude having 1 tox damage and not being able to heal is really frustating
 2018-05-03 19:14:32 -05:00
Trevor Serpas
66f79a61c4 constant chip fix (#37636) 
removes extra pins from constant chip
 2018-05-03 19:13:20 -05:00
CitadelStationBot
d574fc5590 Merge pull request #6622 from Citadel-Station-13/upstream-merge-37289 
[MIRROR] Science can now print off processors as well
 2018-05-03 09:07:59 -05:00
CitadelStationBot
4dc647d8ff Merge pull request #6626 from Citadel-Station-13/upstream-merge-37595 
[MIRROR] Plasmamen organs GET sprites!
 2018-05-03 09:02:15 -05:00
CitadelStationBot
a351edea90 Merge pull request #6625 from Citadel-Station-13/upstream-merge-37414 
[MIRROR] Removes stock market
 2018-05-03 09:01:12 -05:00
Dax Dupont
a8a31c9e4b You can no longer print infinite ammunition. (#37626) 
* You can no longer print infinite ammunition.

* henk

lazy

anus

Reduces .38

Casings now give a tiny bit of metal so the janitor gets a buff

spacing
 2018-05-03 08:45:17 -05:00
Jordan Brown
61263daa0b Merge pull request #37625 from ShizCalev/infrared 
Updates infrared emitters to use the rotate component
 2018-05-03 08:44:01 -05:00
Jordan Brown
deddd8debe Merge pull request #37622 from ShizCalev/cockarock 
Changes cockroach guts to insect guts
 2018-05-03 08:42:46 -05:00