shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,809 Commits 5 Branches 0 Tags
f8a365490bbdca6f4ae72354364db8403ea2dce1
Commit Graph

20661 Commits

Author SHA1 Message Date
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
Putnam3145
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
kevinz000
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
kevinz000
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
Trilbyspaceclone
b4f57a8885 Update others.dm 2020-03-12 10:56:25 -04:00
Trilbyspaceclone
41ed18a537 Changes up some lava land ruins spawns (#11422) 
* Update lavaland.dm

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

* Update twohanded.dm
 2020-03-12 14:21:47 +01:00
Ghom
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
Ghom
9e3a3dddfd Merge pull request #11429 from Putnam3145/dynamic-tweaks 
Dynamic tweaks/fixes
 2020-03-12 14:20:28 +01:00
Ghom
9e970b4a3e Merge pull request #11430 from Putnam3145/fix-transfer 
Tweaks for the transfer vote
 2020-03-12 14:20:10 +01:00
Ghom
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
kevinz000
0b6c5b7960 Update twohanded.dm 2020-03-11 18:19:09 -07:00
Ghom
88bdc6d068 Merge pull request #11440 from kevinz000/master_fix 
fixes master
 2020-03-12 01:54:15 +01:00
Ghom
dbc54ab699 Update actions.dm 2020-03-12 01:47:51 +01:00
kevinz000
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
kevinz000
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
kevinz000
3ae8016ec8 Merge pull request #11373 from kappa-sama/supershotty 
miner powercreep starring 150 damage pointblank shotgun
 2020-03-11 17:27:22 -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
kappa-sama
80b17cff1f Merge branch 'master' into patch-17 2020-03-11 20:26:13 -04:00
kevinz000
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
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
kevinz000
3df171cf99 Merge pull request #11414 from Citadel-Station-13/Ghommie-patch-3-1 
Fixes mob spawners errors with posibrains.
 2020-03-11 17:00:46 -07:00
Ghom
9f681e9a76 Merge pull request #11409 from necromanceranne/taser_nerf 
Particle Defender no longer just the HoS taser but a shotgun/Stimulants protect against the tased effect.
 2020-03-12 00:30:52 +01:00
Ghom
199272ca9d Merge pull request #11410 from necromanceranne/harvesters_and_mechs 
Ports tg#44633: Fixes blood beam oneshotting mech pilots.
 2020-03-12 00:28:03 +01:00
Ghom
e41e3a5fbb Update banana.dm 2020-03-12 00:22:53 +01:00
Ghom
3b102c4ef7 Merge pull request #11432 from Citadel-Station-13/kevinz000-patch-2 
legion swarming now only applies to legions, not all of everything else that is a supertype and subtype of /hivelordbrood
 2020-03-11 17:21:00 +01:00
Ghom
77bdb9afe8 Update flavor_text.dm 2020-03-11 17:15:04 +01:00
Ghom
ed92d21a0e Merge pull request #11427 from Citadel-Station-13/kevinz000-patch-5 
Fixes posibrain/MMI mechs not getting any mobility flags
 2020-03-11 16:48:02 +01:00
kevinz000
2bf892c482 Update bubblegum.dm 2020-03-11 08:07:37 -07:00
kevinz000
bfeb2f0952 Update hivelord.dm 2020-03-11 08:07:20 -07:00
kevinz000
2552a34c21 Update hivelord.dm 2020-03-11 08:02:33 -07:00
kevinz000
ee68e71b2a Update bubblegum.dm 2020-03-11 08:01:34 -07:00
kevinz000
dbcb9fec6a Update code/modules/mob/living/brain/brain.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-11 07:56:26 -07:00
Ghom
d5a6c25128 Update tablet.dm 2020-03-11 13:19:57 +01:00
Ghom
f7674067d2 Merge pull request #11421 from Citadel-Station-13/kevinz000-patch-2 
Fixes the "blind while not unconscious bug", alternatively, "if in doubt, assume something is coded in the worst possible way and is held together by duct tape and prayers"
 2020-03-11 13:17:47 +01:00
Ghom
901fd6b96b Merge pull request #11420 from kappa-sama/patch-18 
removes limbo courtesy of bhijn
 2020-03-11 13:17:08 +01:00
Putnam
8a00a15621 removed no-votes mattering more than votes (??) 2020-03-11 03:01:05 -07:00
Putnam
a1f820be45 maybe check the rest of the codebase 2020-03-11 03:00:07 -07:00
Putnam
1e907ac1c0 Made random's pop_antag_ratio 7 too 2020-03-11 02:58:39 -07:00
Putnam
430f3decdc Fixed dynamic runtiming in some circumstances. 2020-03-11 02:48:18 -07:00
Putnam
5b46af0f88 Added a proper extended-lite. 2020-03-11 02:47:59 -07:00
Putnam
8db3a3ced4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dynamic-tweaks 2020-03-11 02:17:16 -07:00
Putnam
a724de6dd8 Moved disease, revenant from midround to event. 2020-03-11 01:40:13 -07:00
Putnam
f5bde6a869 Let clown ops inherit from nuke ops 2020-03-11 01:39:48 -07:00