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

4328 Commits

Author SHA1 Message Date
Ghom
1babc75a69 Merge pull request #11818 from spookydonut/patch-1 
Update spacemandmm to 1.4
 2020-04-11 23:59:31 +02:00
Ghom
f9f1bbc05f Merge pull request #11804 from Akrilla/beepsky-tie 
Fixes beepsky ziptie weirdness
 2020-04-11 13:40:24 +02:00
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
Akrilla
8abc0cc0a7 !on 2020-04-11 05:24:24 +01:00
Ghom
a75bd30911 Update carbon_defense.dm 2020-04-10 19:54:12 +02:00
kevinz000
d5769a6ee4 Update carbon_defense.dm (#11738) 2020-04-10 18:13:50 +02:00
Akrilla
2a05903808 do_after 2020-04-10 04:26:35 +01:00
kevinz000
0cd7437f49 Update status_procs.dm 2020-04-09 09:33:21 -07:00
Putnam3145
5078b5875a Fixes my oldish badcode. (#11781) 2020-04-09 14:48:58 +02:00
kevinz000
956a85ab34 Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening 
Punch Changes 2: The Quickening
 2020-04-09 02:09:51 -07:00
Lin
8379169b81 Merge pull request #11476 from kevinz000/shield_refactor 
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
 2020-04-07 20:47:15 +00:00
kevinz000
8b2132317b Ports a rewritten version of BAYSTRUMENTS (#11680) 
* bay instruments

* k

* AAA

* remove that

* changes

* Update _instrument_key.dm

* safety nets

* @ghommie fixed

* volume

* Update item.dm

* Update item.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-04-07 15:21:50 +02:00
kevinz000
d89170e441 Merge pull request #11748 from Trilbyspaceclone/patch-334 
Infested plasmamen now are miner type
 2020-04-06 15:47:00 -07:00
kevinz000
699f891166 Merge pull request #11750 from Putnam3145/pluoxium 
Makes miasma actually properly incorporate with air instead of using hacky spec heat stuff
 2020-04-06 15:46:09 -07:00
necromanceranne
d1e77ab087 Merge branch 'master' into pawnch_2_the_pawnchening 2020-04-06 12:31:16 +10:00
Putnam
31f4269515 Makes miasma generate correctly, reverts previous pluox change. 2020-04-05 03:23:58 -07:00
Trilbyspaceclone
7ed168da7f Update hivelord.dm 2020-04-05 03:05:41 -04:00
kevinz000
956c2a57bf Merge pull request #11729 from Ghommie/Ghommie-cit666 
Ports the VV Refactor by Kevinz.
 2020-04-04 19:19:25 -07:00
kevinz000
2a2234483f Merge pull request #11727 from Putnam3145/vore-pacifist-fix 
Makes pacifists able to vore properly
 2020-04-04 07:15:54 -07:00
kevinz000
886f0d7500 Merge pull request #11726 from Ghommie/Ghommie-cit665 
Dwarfy message spam QoL.
 2020-04-04 07:11:02 -07:00
necromanceranne
923486eb43 Merge branch 'master' into pawnch_2_the_pawnchening 2020-04-04 13:40:34 +11:00
kevinz000
413ded02c0 Merge pull request #11433 from Ghommie/Ghommie-cit616 
Spellcasting element
 2020-04-03 16:31:10 -07:00
Ghommie
9d97f1acda Ports the VV Refactor by Kevinz. 2020-04-03 19:16:43 +02:00
Ghom
a9ea7be699 Update dwarves.dm 2020-04-03 18:21:38 +02:00
necromanceranne
c5b55826b5 Punches land with the same consistency across races, punches cheaper, king hits are nastier (#11707) 
* I think everyone should be landing punches now.

* brawling just got mathematical?

* pawnch harder get tired less this is a balance change now I guess

* nearly added instastun king hits, now stun punches are more rng

* I'm tired okay
 2020-04-03 14:19:40 +02:00
Putnam
492546c05c Pacifist digestion checks are elsewhere anyway 2020-04-03 01:53:35 -07:00
necromanceranne
0c46c151f9 Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage. 2020-04-03 19:42:25 +11:00
Ghom
37b6aa9897 Update dwarves.dm 2020-04-03 05:31:37 +02:00
Ghommie
4ef42ba6b1 Dwarfy message spam QoL. 2020-04-03 05:16:17 +02:00
necromanceranne
b37dc1e322 Merge branch 'punch' into pawnch_2_the_pawnchening 2020-04-03 14:02:42 +11:00
necromanceranne
e1a013bcb2 I'm tired okay 2020-04-03 11:30:00 +11:00
necromanceranne
c481db2bfd nearly added instastun king hits, now stun punches are more rng 2020-04-03 11:25:29 +11:00
necromanceranne
f26a9b948c pawnch harder get tired less this is a balance change now I guess 2020-04-03 10:50:26 +11:00
Putnam3145
736ef2cb7c Merge pull request #11705 from Ghommie/Ghommie-cit659 
It's past midnight, time for your runtime errors fixing.
 2020-04-01 23:16:29 -07:00
kevinz000
baf5150c51 fixes two runtimes 2020-04-01 22:35:26 -07:00
Putnam3145
a9bfe00302 Merge pull request #11701 from Ghommie/Ghommie-cit657 
Massive megafauna buff.
 2020-04-01 20:54:32 -07:00
necromanceranne
13c474f2af brawling just got mathematical? 2020-04-01 22:05:22 +11:00
necromanceranne
157ef93c0b I think everyone should be landing punches now. 2020-04-01 15:12:59 +11:00
Ghom
5f128447f5 Update guardian.dm 2020-04-01 02:21:50 +02:00
Ghommie
5bae25c889 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit659 2020-04-01 00:49:13 +02:00
Ghommie
8bb98f92ca It's past midnight, time for your runtimes flattening. 2020-04-01 00:47:29 +02:00
Putnam3145
658701bf37 Various ghost role QoL; moving holding facility; removing energy net (#11676) 
* Removed gay baby jail net from ninja

* Made a proper holding facility for syndicate contractors

* Made ghost role eligibility able to allow reghosting.

* Added a medibot to the holding facility.

* Added new comsigs to every other ghost proc

* Properly dummied out capture objective
 2020-03-31 22:04:55 +02:00
Ghommie
021ebcec66 Massive megafauna buff. 2020-03-31 14:09:32 +02:00
kevinz000
2521aa4973 Merge pull request #11677 from actioninja/wooow-glow 
Better glowing lights
 2020-03-30 14:50:36 -07:00
kevinz000
6e140f003c cloners now give TRAIT_MUTATION_STASIS and prevent active genes from ticking while inside (#11691) 
* Update cloning.dm

* Update traits.dm

* Update life.dm

* Update code/__DEFINES/traits.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-30 23:24:51 +02:00
Lin
4eaf8882f3 Merge pull request #11670 from Citadel-Station-13/Ghommie-patch-2 
fixing no grav limbless slowdown
 2020-03-30 19:57:14 +00:00
actioninja
f419653c28 functionality 2020-03-28 23:50:06 -07:00
Lin
659873979f Merge pull request #11656 from Xantholne/bumbleswakeup 
Bumbles my man, you gotta stop sleeping for more than 8 hours it's bad for your health
 2020-03-29 02:06:09 +00:00
Ghom
1ab929c7c9 fixing no grav limbless slowdown 2020-03-29 00:58:33 +01:00
kevinz000
9595df3e18 Merge pull request #11653 from zeroisthebiggay/holoparsiteportsarefunny 
ports tg holoparasite customizations
 2020-03-28 16:02:08 -07:00