shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,161 Commits 5 Branches 0 Tags
5df4287c8d4360f0a2dee544e3cf9c6a95e00fca
Commit Graph

2622 Commits

Author SHA1 Message Date
kevinz000
24370db5eb Merge pull request #11930 from Ghommie/Ghommie-cit693 
More ToS Compliance.
 2020-04-18 19:33:10 -07:00
kevinz000
b65ad491b4 Merge pull request #11902 from Citadel-Station-13/revert-11611-patch-2 
Revert "Makes so turning in place updates riders when riding someone's back"
 2020-04-18 19:32:34 -07:00
Ghommie
39aef14924 More ToS Compliance. 2020-04-19 02:40:58 +02:00
Ghom
7e57a3410e Merge pull request #11905 from Putnam3145/fix-rads-again 
Fixes a divide-by-zero
 2020-04-19 00:32:41 +02:00
Ghom
bd03d2a362 Merge pull request #11908 from Putnam3145/fix-tactical-destroy 
Makes tactical component destroy() work properly.
 2020-04-18 13:32:49 +02:00
Ghom
9b981d0749 Merge pull request #11888 from Citadel-Station-13/kevinz000-patch-9 
fixes closer extending too many rows up
 2020-04-18 13:28:34 +02:00
Putnam
d361a8d6ae Makes tactical destroy() work properly. 2020-04-17 22:33:11 -07:00
Ghom
2659459233 web-editor played me a good prank. 2020-04-18 03:48:57 +02:00
Ghom
9c4d10a19c Update code/datums/radiation_wave.dm 2020-04-18 03:48:03 +02:00
Putnam
cbc02a8f0b fixes a divide-by-zero whoops 2020-04-17 18:28:15 -07:00
Ghom
2676d663d6 Revert "Makes so turning in place updates riders when riding someone's back" 2020-04-18 03:09:49 +02:00
kevinz000
3c4c67b6c5 Merge pull request #11869 from necromanceranne/pawnch_updaties 
Pawnch Update 2.5: I swear this will be the last one for a while. + some slight fixes
 2020-04-17 05:43:49 -07:00
kevinz000
e84e6bface Merge pull request #11857 from Trilbyspaceclone/race_drinks 
Race drinks!
 2020-04-17 05:20:53 -07:00
kevinz000
61f833b953 Merge pull request #11852 from Ghommie/Ghommie-cit681 
Custom skin tone preferences.
 2020-04-17 05:16:04 -07:00
kevinz000
121b9f0d92 Update ui.dm 2020-04-16 22:57:27 -07:00
Ghom
e511deabcf Merge pull request #11844 from Arturlang/crafting_fixes 
Its no longer possible to craft multiple things at a time
 2020-04-16 19:08:09 +02:00
Ghom
19f79f8843 Merge pull request #11611 from monster860/patch-2 
Makes so turning in place updates riders when riding someone's back
 2020-04-16 19:06:10 +02:00
necromanceranne
4d1abaad3a fecc 2020-04-15 19:59:55 +10:00
necromanceranne
80ce9b70af hecc 2020-04-15 19:48:18 +10:00
necromanceranne
d0d766efb5 Some balance alterations to make pugilism actually worth a damn, lets you craft armwraps (magic ones too if you want to go to the effort), and also buffs some stamina damage on various martial arts 2020-04-15 19:00:01 +10:00
Trilbyspaceclone
3def6b861f Update drink_events.dm 2020-04-14 20:04:18 -04:00
Trilbyspaceclone
c4f951b80b Tho it IS ment to be 6 not 10 2020-04-14 19:35:23 -04:00
TrilbySpaceClone
d49210fd48 Merge branch 'master' into race_drinks 2020-04-14 19:21:47 -04:00
Linzolle
f828f4c4b7 Merge remote-tracking branch 'forrest/wewlad' into tos-compliance 2020-04-14 17:33:47 -05:00
Ghommie
571584901c Custom skin tone preferences. 2020-04-14 19:10:28 +02:00
TrilbySpaceClone
79a72a50d4 this is annoying, why is angel not defind as a race 2020-04-14 11:13:49 -04:00
Ghom
49e36e47ff Merge pull request #11809 from kevinz000/storage_rework 
Adds baystation-style volumetric space storage support
 2020-04-14 13:17:11 +02:00
Ghom
5d01e05991 Merge pull request #11618 from Arturlang/Garlic 
Adds garlic, and tweaks bloodsuckers a bunch.
 2020-04-14 12:38:34 +02:00
kevinz000
7861b044ea Merge pull request #11826 from Ghommie/Ghommie-cit675 
Body size preferences! Oh no!
 2020-04-14 01:35:46 -07:00
kevinz000
e271376c4e Merge pull request #11830 from Ghommie/Ghommie-cit676 
Fixes the phantom thief component, again
 2020-04-14 01:34:18 -07:00
Artur
356f2913d7 Ghommies suggestions and renames a proc 2020-04-14 09:30:14 +03:00
Artur
f910a0fd32 Conflict fixes 2020-04-14 09:27:54 +03:00
Putnam3145
d1bdcd3401 Merge pull request #11840 from Citadel-Station-13/Ghommie-patch-1 
Actually fixed wizard garbs.
 2020-04-13 17:26:55 -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
Artur
5f44d37ca0 Its no longer possible to craft multiple things at a time 2020-04-13 23:51:54 +03: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
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
8145513ba7 Actually fixed wizard garbs. 2020-04-13 14:19:13 +02: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
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
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
Ghommie
acb5c39b59 Fixes the phantom thief component for the Xth time. 2020-04-12 07:47:28 +02:00
Ghom
fc58a34248 Merge pull request #11823 from Putnam3145/contam-buff 
Bringing contamination back
 2020-04-12 06:29:40 +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