shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,639 Commits 5 Branches 0 Tags
448706d540ef4f6dd5abc13d722f860f034cc18a
Commit Graph

23396 Commits

Author SHA1 Message Date
silicons
448706d540 Merge pull request #12749 from TheSpaghetti/patch-2 
Adds monophobia quirk.
 2020-07-20 16:54:25 -07:00
silicons
4d4133a8da Merge pull request #12819 from Arturlang/bloodsucker_typo 
Fixes a bloodsucker lair typo
 2020-07-20 16:53:42 -07:00
Lin
210b7b281c Merge pull request #12727 from Citadel-Station-13/silicons-patch-19 
bandaids around turnstiles being bad code until it can have its movement checks refactored
 2020-07-20 18:25:01 -05:00
Lin
7adae61ade Merge pull request #12773 from Citadel-Station-13/silicons-patch-28 
jexp exemption now also exempts from antag days remaining locks
 2020-07-20 18:22:42 -05:00
Lin
923b4cbb4f Merge pull request #12823 from Citadel-Station-13/gravity_update 
gravity now immediately updates on entering/exiting areas with different gravity and space meaning no more slow for 4 seconds while in a hardsuit and then fast with jetpack
 2020-07-20 18:21:55 -05:00
Lin
f0df3689dc Merge pull request #12790 from Citadel-Station-13/silicons-patch-30 
truncates sdql2 output to 2500 objects instead of 20000 because it's a real epic gamer moment when admins crash their clients doing SELECT /datum/gas_mixture
 2020-07-20 18:20:27 -05:00
Lin
67a6330e77 Merge pull request #12786 from silicons/survivalists 
makes survivalists pseudoantags again and limits summon guns/magic to one use
 2020-07-20 18:20:08 -05:00
Lin
f7355dde62 Merge pull request #12728 from silicons/vote 
"I didn't see the map vote" - Adds a stat vote panel for plurality and approval voting as an alternative to the regular popups.
 2020-07-20 18:17:45 -05:00
silicons
267186a5d3 Merge pull request #12646 from Chiirno/emi 
[READY] Alt-click cigarette pack functionality added to pill bottles.
 2020-07-20 16:15:38 -07:00
silicons
dec84af233 Merge pull request #12830 from Funce/genetic-spider-fix 
Fixes genewebs being impossibly impassable
 2020-07-20 10:49:10 -07:00
Chiirno
64d5bd0030 switches around messages 2020-07-19 21:38:44 -03:00
Funce
0c07faa3e0 For future reference, '.' return overrides 'return' statements 2020-07-20 12:22:18 +12:00
Funce
2af449a3c7 Fixes genewebs being impossibly impassable 2020-07-20 11:55:23 +12:00
BlackMajor
f265b85d3b Merge pull request #12810 from lolman360/master 
service borg fix/tweak
 2020-07-20 11:42:59 +12:00
Lin
b47872c079 Merge pull request #12802 from Citadel-Station-13/silicons-patch-31 
fixes eshields not reflecting while active blocking uh oh
 2020-07-19 11:12:32 -05:00
Lin
f2e0e5c247 Merge pull request #12814 from Citadel-Station-13/silicons-patch-35 
fixes gateways switching to active power use when thy should not be using power at all
 2020-07-19 11:10:51 -05:00
silicons
5b408d5b33 Update space.dm 2020-07-18 20:52:15 -07:00
silicons
9b1aa39497 Update space.dm 2020-07-18 20:51:30 -07:00
silicons
53dd4fc857 Update areas.dm 2020-07-18 20:50:28 -07:00
Artur
de5e87d522 Fixes a typo 2020-07-19 02:37:11 +03:00
TheSpaghetti
16957d78e9 Makes the grammar bad again. 
For some reason the fixed grammar didn't compile.
 2020-07-18 18:11:48 -04:00
Lin
ba3dc6a73b Merge pull request #12679 from silicons/unarmed_parry 
Ok ok hear me out: Implements unarmed parry.
 2020-07-18 17:02:02 -05:00
silicons
56f56d5cbe Update gateway.dm 2020-07-18 10:24:36 -07:00
Lin
e165524763 Merge pull request #12803 from Citadel-Station-13/silicons-patch-32 
removes tango dancing
 2020-07-18 11:17:42 -05:00
Putnam
d88ade40bf actually fixes uplink 2020-07-18 01:51:59 -07:00
lolman360
55ed77a89d Update robot_modules.dm 2020-07-18 16:15:47 +10:00
lolman360
f696a461af Update RSF.dm 2020-07-18 16:10:25 +10:00
lolman360
f84b044f34 Update robot_modules.dm 2020-07-18 16:05:57 +10:00
lolman360
0e38e1ff39 e 2020-07-18 16:03:32 +10:00
silicons
b98102a824 Merge pull request #12762 from zeroisthebiggay/a 
drops martial art minpops down to twenty pop
 2020-07-17 17:11:02 -07:00
silicons
a8e2b84ad8 Merge pull request #12763 from zeroisthebiggay/b 
hopefully fixes records possibly
 2020-07-17 17:10:40 -07:00
silicons
c924290cd1 Merge pull request #12733 from TheObserver-sys/Finally,moreblorble 
Slime Extractification
 2020-07-17 17:10:32 -07:00
silicons
044525519a Merge pull request #12750 from timothyteakettle/loadout-plushies 
replaces plushies in the loadout menu with a choice box
 2020-07-17 17:10:14 -07:00
silicons
8caf063765 Merge pull request #12757 from Owai-Seek/better-snack-comments 
Updates some comments.
 2020-07-17 17:09:50 -07:00
silicons
93d669d205 Merge pull request #12759 from YakumoChen/hierophant-hugbox 
set hierophant friendly fire check to on by default
 2020-07-17 17:09:17 -07:00
silicons
655afda020 Merge pull request #12780 from BlackMajor/borgo 
Even more engiborg power creep
 2020-07-17 17:08:23 -07:00
silicons
3d5c77f62b Merge pull request #12779 from b1tt3r1n0/circlegame 
Circle Game, Updated
 2020-07-17 17:08:06 -07:00
silicons
04df84d1e0 Merge pull request #12776 from timothyteakettle/snail-shells 
snail shell backpack
 2020-07-17 17:07:46 -07:00
silicons
183a929e42 Merge pull request #12775 from timothyteakettle/wrestling-rotation-fix 
wrestling rotation fix
 2020-07-17 17:07:06 -07:00
silicons
a2c3643e20 fix 2020-07-17 12:46:32 -07:00
Lin
76c6c767d9 Merge pull request #12784 from silicons/shields 
fixes active block toggle not existing
 2020-07-17 14:43:40 -05:00
silicons
cc6079d413 Update human_movement.dm 2020-07-17 09:10:03 -07:00
silicons
813fd9b3e0 Update shields.dm 2020-07-17 09:00:02 -07:00
BlackMajor
9b671b7dd1 I'm gonna regret this. Adds stock parts (meaning cells) to the gripper list 2020-07-18 03:08:52 +12:00
TheSpaghetti
b2e9579217 Fixes typos in the light sensitivity trait. 
It was bothering me.
 2020-07-17 00:48:45 -04:00
BlackMajor
eb9b3da581 Blacklist logic fix 2020-07-17 16:13:18 +12:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
silicons
e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0 
[READY]TGUI 3.0
 2020-07-16 17:28:42 -07:00
Timothy Teakettle
ebd648c03d name edgecase too 2020-07-16 18:32:24 +01:00
Timothy Teakettle
a8a495c0ac rewrites pickle handling 2020-07-16 18:22:58 +01:00