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

21398 Commits

Author SHA1 Message Date
kevinz000
6d7cc834f6 Merge pull request #11379 from Ghommie/Ghommie-cit611 
Polychromic element.
 2020-04-13 17:10:45 -07:00
Ghommie
39e645b018 I knew using lazy helpers wouldn't have helped much. 2020-04-14 01:55:01 +02:00
Ghommie
42ff9b1d35 Final test, fixes and parent calls. 2020-04-14 01:23:26 +02:00
Ghommie
616d482cf6 Deleting poly clothes copypasta. 2020-04-13 22:51:46 +02:00
Ghommie
8c995dbad9 Making things work. 2020-04-13 19:16:55 +02:00
Ghommie
bfa006fac1 Fixing runtime errors. 2020-04-13 17:25:13 +02:00
Ghom
25f1a83473 Merge pull request #11834 from deathride58/linuxfail2topic 
adds rudimentary linux iptables support for fail2topic (and makes fail2topic disabled by default while i'm at it)
 2020-04-13 16:44:15 +02:00
Ghommie
db43f53ac4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 16:15:40 +02:00
Ghommie
0816512150 more work. 2020-04-13 16:09:52 +02:00
kevinz000
9f2ed092c5 Merge pull request #11275 from Citadel-Station-13/Ghommie-patch-6 
Reenables the swarmers event.
 2020-04-13 05:50:24 -07:00
Ghom
dfa58cb517 Merge pull request #10986 from Seris02/atomwalkers 
wall walking boots for traitors
 2020-04-13 14:25:43 +02:00
Ghom
6157500f25 FYI, Dropped() already handles it. 2020-04-13 14:16:48 +02:00
Seris02
468c59bf49 oops 2020-04-13 20:12:20 +08:00
kevinz000
768909020e Merge pull request #11827 from kiwedespars/nerf 
nerfs immortal haste cd
 2020-04-12 22:35:10 -07:00
kevinz000
105d405d2d Merge pull request #11837 from Ghommie/Ghommie-cit678 
Item color removal port fixes.
 2020-04-12 22:34:45 -07:00
Seris02
950038f4a7 merge fixes? 2020-04-13 11:12:16 +08:00
Seris02
f158536e59 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atomwalkers 2020-04-13 11:10:24 +08:00
Seris02
b9c9991a5d merge fix 2020-04-13 10:57:09 +08:00
Ghommie
0d0f14d3f8 Item color removal port fixes. 2020-04-13 03:34:58 +02:00
Ghom
609eb190e0 Update area_copy.dm 2020-04-13 03:29:07 +02:00
kevinz000
e962afedfa Merge pull request #11825 from Ghommie/Ghommie-cit674 
Little Holodeck refactor.
 2020-04-12 17:03:11 -07:00
kevinz000
80de717dc8 Merge pull request #11824 from Ghommie/Ghommie-cit673 
Fixes occasional tunnel hole in the space hermit ruin.
 2020-04-12 17:02:52 -07:00
kevinz000
6b6683846b Merge pull request #11819 from Ghommie/Ghommie-cit672 
Minor action datum refactor and spellcasting fix.
 2020-04-12 17:02:36 -07:00
kevinz000
8604297dcd Merge pull request #11811 from Ghommie/Ghommie-cit671 
Fixes and standarizes a few liver troubles. Re-enables liver failure.
 2020-04-12 17:01:50 -07:00
kevinz000
f647fe92fa Merge pull request #11810 from Citadel-Station-13/Ghommie-patch-4 
Re-enables hulks.
 2020-04-12 17:01:22 -07:00
Ghommie
05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
Ghom
d0af60a2d3 Merge pull request #11817 from Putnam3145/dynamic-lings-2 
More dynamic tweaks + dynamic latejoin changelings
 2020-04-13 01:48:12 +02:00
kevinz000
d60932ca5d Merge pull request #11697 from Ghommie/Ghommie-cit655 
Ports "Obliterates item_color: new washing machine functionality edition"
 2020-04-12 16:16:37 -07:00
deathride58
53d893a67e adds rudimentary linux iptables support for fail2topic 2020-04-12 16:21:51 -04:00
Ghom
b00e97b848 Merge pull request #10732 from kevinz000/eldritch_affairs 
Eldritch Affairs
 2020-04-12 20:47:19 +02:00
Lin
4e1079bc9a Merge pull request #11786 from Citadel-Station-13/Ghommie-patch-1 
I did a oopsie and made containment bags also stop radiation internal to a contained object.
 2020-04-12 16:20:08 +00:00
kiwedespars
6f8992e712 Update haste.dm 2020-04-11 21:34:06 -07:00
Ghom
fc58a34248 Merge pull request #11823 from Putnam3145/contam-buff 
Bringing contamination back
 2020-04-12 06:29:40 +02:00
Ghom
f5852424e3 Merge pull request #11812 from Auris456852/master 
Adds admin printer noise for Centcomm/Syndicate messages
 2020-04-12 06:25:52 +02:00
Ghom
3f573fb611 Merge pull request #11814 from kappa-sama/patch-19 
fixes stomping and increases Stam damage from krav
 2020-04-12 06:24:57 +02:00
Ghom
28642ce39c Merge pull request #11816 from necromanceranne/broke_dodging 
fixes rising bass and sleeping carp not dodging
 2020-04-12 06:23:47 +02:00
Ghom
a96f6238df Merge pull request #10891 from Trilbyspaceclone/more_crates+bags 
[Ready]Better crate options
 2020-04-12 05:48:20 +02:00
Ghom
d693d3ef26 Merge pull request #11807 from Citadel-Station-13/kevinz000-patch-4 
datum pipeline null gasmix stack trace now gives a REF()
 2020-04-12 05:46:07 +02:00
Ghommie
983f369357 Little Holodeck refactor. 2020-04-12 01:49:25 +02:00
Ghom
1babc75a69 Merge pull request #11818 from spookydonut/patch-1 
Update spacemandmm to 1.4
 2020-04-11 23:59:31 +02:00
Ghommie
a141c56b00 Not-so-airless turfs. 2020-04-11 23:43:01 +02:00
Ghommie
ab3ed7f9c2 Space Hermit Ruin fixes. 2020-04-11 23:27:19 +02:00
Putnam
c8ebc6411e Actually let's make it... differenter. 2020-04-11 12:58:43 -07:00
Putnam
b5a150911c Massively buffs contamination numbers 2020-04-11 12:43:14 -07:00
Putnam
a779ec2411 Makes contamination work (whoops) 2020-04-11 12:42:25 -07:00
spookydonut
a6f6a27c87 Update code/modules/vending/_vending.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-04-12 00:53:57 +08:00
Ghom
848c1996e4 Merge pull request #11806 from Citadel-Station-13/kevinz000-patch-3-1 
removes hotspot expose from skateboards
 2020-04-11 18:31:26 +02:00
Ghom
ae1785af70 Merge pull request #11802 from Akrilla/alien_attack 
Fixes attack_alien damage
 2020-04-11 18:31:07 +02:00
Ghom
11fa208838 Merge pull request #11800 from Akrilla/changling-readapt 
Fixes up changling readapting
 2020-04-11 18:30:49 +02:00
Ghommie
7615f63753 Oopsie 2020-04-11 17:43:09 +02:00