shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,117 Commits 5 Branches 0 Tags
cf4f7a705d68ef50fe283ad4be03577ea8ba5b1a
Commit Graph

4423 Commits

Author SHA1 Message Date
ZeroMan
93b1ade0bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies 
# Conflicts:
#	code/modules/uplink/uplink_items/uplink_badass.dm
 2020-03-21 02:17:13 -04:00
kevinz000
4eaa3a22c2 fixes beam rifles and some micro optimizations to projectiles and readds the chameleon gun for debugging (#11528) 
* wew

* ah

* k

* k

* faster
 2020-03-21 02:45:34 +01:00
kevinz000
1bb0c01ff1 Hypereutactic blade properly slows you down again, adds set_slowdown() and hooks vv_edit_var for it (#11553) 
* ok

* Update items.dm
 2020-03-21 02:42:02 +01:00
necromanceranne
570f6e8a66 Plastitanium Rapier: Sleepy Edition (#11507) 
* knockout rapier, improved sprites

* it's a rapier not a foil those aren't synonyms

* whoops

* needs it's shanking sound

* Put a stamina loss threshold onto the swords slep so you need at least two hits to proc the sleep. Don't get stabbed more than once!

* Update items_and_weapons.dmi

* Removes chat spam and also frankly it doesn't need drowzy on top
 2020-03-20 16:07:04 +01:00
ZeroMan
35a4d71a54 im sorry little one 2020-03-19 21:59:14 -04:00
kevinz000
8b0600a7fa Merge pull request #11527 from Ghommie/Ghommie-cit628 
More bug reports yee'd their last haw.
 2020-03-19 18:56:32 -07:00
Seris02
ea8941343e stops validhunting geneticists from knowing exactly who is an is a vampire (and allows vampires genes) (#11520) 
* yeet gone

* pfft oof

* oof
 2020-03-19 13:40:11 +01:00
Ghommie
32975bf509 More bug reports yee'd their last haw. 2020-03-18 23:43:23 +01:00
kevinz000
00e0683889 Merge pull request #11501 from Citadel-Station-13/Ghommie-patch-4 
Ports "Makes iron sheets build the normal metal table again"
 2020-03-17 09:29:29 -07:00
kevinz000
039c56f3a9 Merge pull request #11495 from BlackMajor/SpaceRuins 
Ash walker camp tweak because Ghommie asked me to.
 2020-03-17 09:29:05 -07:00
kevinz000
8bc8ea71ea Merge pull request #11500 from necromanceranne/electrostarve_sprite_fix 
Electrostaff Sprite Fix
 2020-03-17 09:25:44 -07:00
kevinz000
b062c76ca7 Merge pull request #11485 from Ghommie/Ghommie-cit625 
Fixing a little issue with the musician trait etcetera.
 2020-03-16 13:23:25 -07:00
kevinz000
3c97782a87 Merge pull request #11483 from Hatterhat/mining-borg-nerfs 
mining borg nerfs - "they should be outclassed lategame"
 2020-03-16 13:22:23 -07:00
Ghom
c4597bc570 Update sheet_types.dm 2020-03-16 16:59:37 +01:00
necromanceranne
5eb93eaa56 And these too 2020-03-17 02:49:27 +11:00
necromanceranne
b5872bba63 Pretty sure this should now use the correct sprites 2020-03-17 02:43:44 +11:00
kevinz000
8fdb1e5964 Merge pull request #11465 from Seris02/duffelbagholding 
duffel bags of holding
 2020-03-16 06:12:40 -07:00
Seris02
b8e8a81d1c there 2020-03-16 20:49:10 +08:00
BlackMajor
97b8d0ba27 small ash walker camp tweak 2020-03-16 19:51:47 +13:00
Hatterhat
1fe67d5ce9 a finger of the monkey's paw curls. 2020-03-16 01:35:47 -05:00
Ghommie
5e5bdec85d More runtime errors. 2020-03-16 01:55:02 +01:00
Hatterhat
802d37a399 borgs should be outclassed lategame and not hunt 2020-03-15 15:55:31 -05:00
Ghom
d8a6e9b94f Merge branch 'master' into Ghommie-cit621 2020-03-15 13:07:45 +01:00
kevinz000
195a3b593b Merge pull request #11458 from Trilbyspaceclone/patch-310 
Buffs borg hypos - Anti-radiation addition
 2020-03-14 22:21:32 -07:00
kevinz000
e73e1b03ec Revert "Stunbaton disarm mode also works on disarm intent now" (#11446) 2020-03-14 23:14:57 +01:00
kevinz000
d4131912e9 Merge pull request #11452 from Citadel-Station-13/Linzolle-patch-1 
make the CMO hypokit not literally worse than normal ones
 2020-03-14 09:11:58 -07:00
Seris02
5a04b43db4 duffel baaaaaaaaaaags 2020-03-14 16:12:17 +08:00
Ghommie
1d51ac5ff2 Fixing some bug reports. 2020-03-14 02:34:25 +01:00
Trilbyspaceclone
6993dfde2a Now stocked at your local robotics 2020-03-13 18:29:46 -04:00
Lin
0ca58b5ed8 why though 2020-03-13 04:19:20 +00:00
Ghommie
0876a1eef6 Porting datum components system updates. 2020-03-12 18:22:26 +01:00
kevinz000
87928d43ea stamcrit check for fireaxe afterattack() (#11426) 
* Update twohanded.dm

* Update twohanded.dm
 2020-03-12 14:21:47 +01:00
kevinz000
0b6c5b7960 Update twohanded.dm 2020-03-11 18:19:09 -07:00
kevinz000
54713dc1e4 Merge pull request #11408 from necromanceranne/sleeping_carp_port 
Refactors Martial Arts code, human_defense, and ports New Sleeping Carp
 2020-03-11 17:26:33 -07:00
kevinz000
69c21f4b76 Merge pull request #10327 from Seris02/tggenetics 
ports tg genetics
 2020-03-11 17:01:37 -07:00
Putnam3145
480eb32c68 Merge pull request #11418 from Ghommie/Ghommie-cit615 
Fix runtimes some more.
 2020-03-11 17:01:13 -07:00
kevinz000
0d80c8c169 Merge pull request #11412 from Citadel-Station-13/Ghommie-patch-2 
RCL inhands wires fix.
 2020-03-11 17:01:01 -07:00
Ghom
0d7612dcf5 [s] Sanitizes ParseSong tempo. 2020-03-11 00:29:31 +01:00
Ghommie
27a7f754c4 Fix runtimes some more. 2020-03-10 22:40:06 +01:00
Ghom
b03af0ea9a Update RCL.dm 2020-03-10 14:44:33 +01:00
kevinz000
832d894e92 Merge pull request #11388 from Owai-Seek/crabby-patty-3/1/20 
Food Ports / Butter Bear / Food Craft Speed
 2020-03-10 05:59:24 -07:00
kevinz000
e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612 
Porting "Further update_icon splitup"
 2020-03-10 05:58:17 -07:00
kevinz000
3eac86cf31 Merge pull request #11394 from Citadel-Station-13/Ghommie-patch-3 
Actually fixing that one overlay.
 2020-03-10 05:57:18 -07:00
kevinz000
bfb75eb26b Merge pull request #11396 from Ghommie/Ghommie-cit613 
Ports "Switches out the three billion args of electrocute act for flags"
 2020-03-10 05:56:28 -07:00
necromanceranne
b03d83926a Forgot the scroll 2020-03-10 20:27:40 +11:00
Ghommie
4143c1963c Porting more legcuffs / bola fixes etcetera 2020-03-09 16:20:51 +01:00
Seris02
cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
Ghommie
ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
Ghom
f8c18fe5a8 Update PDA.dm 2020-03-09 00:52:11 +01:00
Ghom
1c5aa2f933 Merge pull request #11377 from Kraseo/contractor-fixes 
Some contractor adjustments & fixes
 2020-03-09 00:26:54 +01:00