shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,069 Commits 5 Branches 0 Tags
2103e9975b87c864847dd9a40d815fbc3b48262f
Commit Graph
20808 Commits
Author SHA1 Message Date
kevinz000andGitHub 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
kevinz000andGitHub 0953ec19e5 Merge pull request #11453 from necromanceranne/I_am_at_high_risk_of_stroke 
I'm pretty sure this was causing people to bleed out from light hits
 2020-03-14 09:11:38 -07:00
kevinz000andGitHub a21458bba6 Merge pull request #11437 from keronshb/BlobBuffPort 
Ports Blob Buffs
 2020-03-14 09:10:54 -07:00
kevinz000andGitHub 395fa32136 Merge pull request #11447 from Ghommie/Ghommie-cit618 
Porting datum components system updates.
 2020-03-14 09:09:50 -07:00
kevinz000andGitHub a35049fc94 Merge pull request #11448 from Ghommie/Ghommie-cit619 
Makes the autotransfer subsystem slightly more modulable.
 2020-03-14 09:09:11 -07:00
Kraseo f8a365490b FUCK² 2020-03-14 13:15:09 +01:00
Kraseo 3f44882c1a FUCK 2020-03-14 13:13:26 +01:00
Kraseo a2592483b5 hey did you know there's not one, not two, but three tiles on roid7.dmm that don't have /area/ruin/space but rather /area/ruin/unpowered? yeah i'm angry too 2020-03-14 13:07:13 +01:00
Seris02 5a04b43db4 duffel baaaaaaaaaaags 2020-03-14 16:12:17 +08:00
Putnam3145andGitHub d9dc91db1a More dynamic fixes (#11451) 
* Fixed wizard, malf AI

* changed memes typename to story

* Fixed a bunch of really weird execute/ready confusion

* Added dynamic requirement to wands.
 2020-03-14 02:49:25 +01:00
Ghommie 1d51ac5ff2 Fixing some bug reports. 2020-03-14 02:34:25 +01:00
TrilbyspacecloneandGitHub 6993dfde2a Now stocked at your local robotics 2020-03-13 18:29:46 -04:00
TrilbyspacecloneandGitHub 888f67c4bc Update borghydro.dm 2020-03-13 18:21:12 -04:00
TrilbyspacecloneandGitHub 487c18cb7e Update misc.dm 2020-03-13 14:20:28 -04:00
necromanceranne 49c0aba205 bleeding out from a toolbox smack is not cool gamers 2020-03-14 04:25:12 +11:00
LinandGitHub 0ca58b5ed8 why though 2020-03-13 04:19:20 +00:00
ZeroMan 3fa39fd7ab i hate my ocd 2020-03-12 20:57:41 -04:00
ZeroMan f5ec7f5b65 it works it works 2020-03-12 20:47:35 -04:00
Putnam b1a94f7667 Made hijack, martyr more common 2020-03-12 15:05:53 -07:00
Putnam ae94083dbe Added more explanation to hijack. 2020-03-12 14:59:04 -07:00
Ghommie da5b293033 underscores. 2020-03-12 21:31:17 +01:00
Ghommie d1b39b6590 . 2020-03-12 21:22:39 +01:00
Ghommie 0602e728c0 Doesn't delete the old auto transfer behavior. 2020-03-12 21:15:12 +01:00
Ghommie 663a849afe Makes the autotransfer subsystem a bit more optional. 2020-03-12 21:02:34 +01:00
Ghommie a6361357d4 Merge branch 'Ghommie-cit595' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit595 2020-03-12 20:36:27 +01:00
Ghommie 8ccd0d2cbc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit595 2020-03-12 20:31:14 +01:00
Ghommie 0876a1eef6 Porting datum components system updates. 2020-03-12 18:22:26 +01:00
kevinz000andGitHub bbd69c407c Merge pull request #11431 from Citadel-Station-13/Ghommie-patch-1 
Missing contractor tablet icon state fix
 2020-03-12 09:49:50 -07:00
kevinz000andGitHub 78aa46d8de Merge pull request #11416 from Trilbyspaceclone/patch-306 
Makes Bluespace and Urianium reagents be able to be turned into sheets
 2020-03-12 09:49:26 -07:00
TrilbyspacecloneandGitHub b4f57a8885 Update others.dm 2020-03-12 10:56:25 -04:00
TrilbyspacecloneandGitHub 41ed18a537 Changes up some lava land ruins spawns (#11422) 
* Update lavaland.dm

* Update lavaland.dm
 2020-03-12 14:25:54 +01:00
kevinz000andGitHub 87928d43ea stamcrit check for fireaxe afterattack() (#11426) 
* Update twohanded.dm

* Update twohanded.dm
 2020-03-12 14:21:47 +01:00
GhomandGitHub 442eb13e75 Merge pull request #11425 from Citadel-Station-13/kevinz000-patch-3 
fixes synthflesh/rezadone dehusk threshold check
 2020-03-12 14:20:49 +01:00
GhomandGitHub 9e3a3dddfd Merge pull request #11429 from Putnam3145/dynamic-tweaks 
Dynamic tweaks/fixes
 2020-03-12 14:20:28 +01:00
GhomandGitHub 9e970b4a3e Merge pull request #11430 from Putnam3145/fix-transfer 
Tweaks for the transfer vote
 2020-03-12 14:20:10 +01:00
GhomandGitHub c771471895 Merge pull request #11406 from kevinz000/minimaps 
Ports station minimaps from Yogstation thank you monster860 you are an epic gamer
 2020-03-12 14:18:39 +01:00
kevinz000andGitHub 0b6c5b7960 Update twohanded.dm 2020-03-11 18:19:09 -07:00
GhomandGitHub 88bdc6d068 Merge pull request #11440 from kevinz000/master_fix 
fixes master
 2020-03-12 01:54:15 +01:00
GhomandGitHub dbc54ab699 Update actions.dm 2020-03-12 01:47:51 +01:00
kevinz000andGitHub fa160d4c3a Merge pull request #11434 from Citadel-Station-13/Ghommie-patch-3 
Fixes flavor text preview on the chatbox.
 2020-03-11 17:44:35 -07:00
kevinz000andGitHub db188f8681 Merge pull request #11307 from kappa-sama/patch-17 
gets rid of fly species requirement from hulk
 2020-03-11 17:43:23 -07:00
kevinz000 6127f6a453 k 2020-03-11 17:41:12 -07:00
kevinz000 14b22f0b67 Merge remote-tracking branch 'citadel/master' into minimaps 2020-03-11 17:32:15 -07:00
kevinz000andGitHub 3ae8016ec8 Merge pull request #11373 from kappa-sama/supershotty 
miner powercreep starring 150 damage pointblank shotgun
 2020-03-11 17:27:22 -07:00
kevinz000andGitHub 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
kappa-samaandGitHub 80b17cff1f Merge branch 'master' into patch-17 2020-03-11 20:26:13 -04:00
kevinz000andGitHub b8642c5622 Merge pull request #11424 from necromanceranne/death_coma_stuff 
Some fakedeath fixes requested by kev also ports a fix from tg to regen coma
 2020-03-11 17:24:03 -07:00
kevinz000andGitHub 69c21f4b76 Merge pull request #10327 from Seris02/tggenetics 
ports tg genetics
 2020-03-11 17:01:37 -07:00
Putnam3145andGitHub 480eb32c68 Merge pull request #11418 from Ghommie/Ghommie-cit615 
Fix runtimes some more.
 2020-03-11 17:01:13 -07:00
kevinz000andGitHub 0d80c8c169 Merge pull request #11412 from Citadel-Station-13/Ghommie-patch-2 
RCL inhands wires fix.
 2020-03-11 17:01:01 -07:00