shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,568 Commits 5 Branches 0 Tags
08f251a88c898ce3a635909512303170483694de
Commit Graph

4421 Commits

Author SHA1 Message Date
Keate Senior
80b4c03c82 Initial changes to get this to github for public reviewing 
-Removes the Reebe z level and puts it on the cc z level
-Replaces the Neovgre mech stepsound
-Moves spacial gateway into drivers so the cult isn't stuck stationside
-Adds the Belligerant scripture, which applies the Belligerant status effect to non-clankers in range
-Various other changes currently commented out for later work on them.
-removes the abductor teleport cameras from Reebe
-adds a Brass multitool, essentially just an advanced multitool with a special sprite.
-makes clockcult armor have 0 laser defense normally and 10 defense when the ark is almost done summoning Ratvar instead of -25 --> -15
-Makes spear recalling worded to support the addition of new weapons to summon
-Adds new structures for power generation and shuttle delaying
-Other changes I've probably forgotton, but are too lazy to scrounge through the code at 12:43 AM
 2020-07-12 00:43:54 -04:00
Strazyplus
582be67063 Lawyer-drake when? 
unmodularized drakeborg
added licencing documentation
reduced / simpified code comments
 2020-07-12 00:42:46 -04:00
silicons
f99a0564de Merge pull request #12693 from Owai-Seek/trashbag-7-4-20 
Trashbag Whitelist Update
 2020-07-11 21:28:12 -07:00
timothyteakettle
3e5f981825 speed 4 for embeds 2020-07-12 03:17:50 +01:00
Strazyplus
13fe156a8b Dragon online! 2020-07-11 21:32:34 -04:00
timothyteakettle
fbb9fe2d9c better fork 2020-07-12 02:14:50 +01:00
timothyteakettle
cff2e3d680 never set max amount to 0 2020-07-12 00:58:34 +01:00
timothyteakettle
8712dd6de4 bugfixes 2020-07-12 00:31:45 +01:00
Timothy Teakettle
c1592ad162 more rewards 2020-07-11 23:27:29 +01:00
silicons
62df48b2f0 Update robot_upgrades.dm 2020-07-11 15:11:53 -07:00
Lin
955d9fa0cc Merge pull request #12624 from Citadel-Station-13/policy 
policy configuration & support hooks for clone memory disorder
 2020-07-11 16:40:38 -05:00
silicons
00867c064c Merge pull request #12715 from HeroWithYay/Drinkable_Telecrystals 
Drinkable and Sell-able Telecrystals
 2020-07-11 00:49:15 -07:00
silicons
4f4c6b85bf Merge pull request #12720 from timothyteakettle/eye-contact 
port examines and eye contact
 2020-07-11 00:14:47 -07:00
Chiirno
2940f0efa5 Update code/game/objects/items/storage/firstaid.dm 
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
 2020-07-10 02:35:42 -04:00
Artur
9de8483bcf Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-09 22:14:20 +03:00
Timothy Teakettle
02f46322ad port examine 2020-07-09 18:32:45 +01:00
Putnam
75c0b01c86 Updated to july 2020. 2020-07-08 23:13:26 -07:00
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
HeroWithYay
bed6f4ac91 Adds "Telecrystal Dust" a useless, red waste of syndicate resources that can be obtained by grinding raw telecrystals in a blender. 
Also makes it so you can sell raw telecrystals at cargo 1000 points each which is also a considerable waste of TC.
 2020-07-09 16:32:14 +12:00
silicons
6d1ca993f6 Merge pull request #12648 from timothyteakettle/tray-and-jar 
bluespace tray + bluespace jar
 2020-07-08 03:10:44 -07:00
silicons
6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Timothy Teakettle
f0935a784d two missing traits woops 2020-07-07 23:24:25 +01:00
Timothy Teakettle
e07909ebe2 does it in a far superior way 2020-07-07 23:12:36 +01:00
Lin
33f56fd168 Merge pull request #12694 from Ghommie/Ghommie-cit833 
mowing down experimental cloner copypasta.
 2020-07-07 13:23:25 -05:00
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
timothyteakettle
ab5795b3d3 Update pet_carrier.dm 2020-07-07 03:03:09 +01:00
Cirno
2553ef6dd8 Am I finally free? 2020-07-05 00:46:56 -03:00
Ghommie
562b57095d mowing down the experimental cloner copypasta. 2020-07-05 03:04:53 +02:00
Winter Flare
767290d8e9 Trashbag Whitelist Update 
Trashbag can now hold:
All Organs
Most Shoes

Trashbags cannot hold:
Jackbooks
Workboots
Clown Shoes
Nuke Disk
Wallets (Nuke Disk Nesting)
Brains
 2020-07-04 21:03:31 -04:00
Lin
703d03453b Merge pull request #12651 from Citadel-Station-13/silicons-patch-9 
lowers shield blocking stamcost/second 3.5 to 2.5
 2020-07-04 14:16:06 -05:00
Lin
d04b335d1a Merge pull request #12652 from silicons/cool 
cybernetic implant shields will now automatically extend and be used to block if the user has no item to block with
 2020-07-04 14:12:43 -05:00
Cirno
c2ba973c88 Merge remote-tracking branch 'origin' into emi 2020-07-04 15:59:47 -03:00
Cirno
020da9fa07 i hope this works 2020-07-04 15:47:38 -03:00
Ghom
17ee8c5960 Merge pull request #12660 from YakumoChen/master 
Reverts improv small arms, makes guncrafting easier and faster
 2020-07-04 18:35:22 +02:00
silicons
bb065abab7 Merge pull request #12690 from BlackMajor/master 
[s] Inheritance is something often overlooked.
 2020-07-04 01:52:13 -07:00
BlackMajor
afdf8c698a fuck 2020-07-04 19:30:20 +12:00
silicons
c10350f10e Merge pull request #12677 from Ghommie/Ghommie-cit830 
Fixes items' skills list keys missing associated traits and improves modulability a little.
 2020-07-04 00:12:37 -07:00
silicons
a61e22de71 Merge pull request #12675 from Ghommie/Ghommie-cit828 
Fixing (un)equip penalties from obscured inv slots.
 2020-07-04 00:12:04 -07:00
silicons
103b8b7600 Merge pull request #12662 from kappa-sama/patch-29 
makes bows and arrows more feasible improv weapons
 2020-07-04 00:11:45 -07:00
silicons
f6be57269d Merge pull request #12687 from Ghommie/Ghommie-cit832 
Fixing obscured inventory slots unequip block, for real.
 2020-07-04 00:10:49 -07:00
BlackMajor
7c21f7bd4e [s] Don't give these to your kids for christmas 
Someone did a fucky wucky.
 2020-07-04 17:17:34 +12:00
timothyteakettle
d3448e04c9 fixes pet carrier edgecase 2020-07-04 03:00:35 +01:00
Ghommie
e3b1ca4942 Linter. 2020-07-03 19:57:38 +02:00
Artur
6c4e733a38 More testmerge fixes 2020-07-03 15:16:02 +03:00
timothyteakettle
05fb7a67fc Merge branch 'tray-and-jar' of https://github.com/timothyteakettle/Citadel-Station-13 into tray-and-jar 2020-07-03 03:46:12 +01:00
timothyteakettle
1316f51a03 better resist and air 2020-07-03 03:46:08 +01:00
Ghommie
f5ffd7d2a9 Easing fine tuning of the system. 2020-07-03 03:00:33 +02:00
Ghommie
6fc584518a Fixing (un)equip penalties from obscured inv slots. 2020-07-03 00:07:30 +02:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00