cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,034 Commits 55 Branches 0 Tags
3e30c9409b825ef5c627c83631f4489e13cbc031
Commit Graph

18633 Commits

Author SHA1 Message Date
kevinz000
831ac91917 Merge pull request #10073 from Ghommie/Ghommie-cit435 
Ports timestop and sepia extracts improvements/tweaks.
 2020-01-24 00:25:53 -07:00
kevinz000
f8ec01676a Merge pull request #10609 from Putnam3145/cold-blooded-buff 
Moved cold-blooded to negative, made it cost -2
 2020-01-24 00:22:08 -07:00
kevinz000
7cd6490e86 Merge pull request #10526 from Seris02/bowmanupgrade 
allows headsets to be bowmanized and adds a traitor item for that
 2020-01-24 00:21:34 -07:00
kevinz000
07277436ac Merge pull request #10665 from Ghommie/Ghommie-cit513 
Fixes chainsaw force being set to 0 on drop.
 2020-01-24 00:20:26 -07:00
kevinz000
6ffdc1642b Merge pull request #10632 from Commandersand/nerd 
buffs some wiz spell cooldonws and changes some incantation phrases
 2020-01-24 00:18:41 -07:00
kevinz000
2a706ceb05 Merge pull request #10664 from kappa-sama/patch-17 
makes cursed dragnet take 5 seconds instead of 30 to break out of
 2020-01-24 00:18:05 -07:00
kevinz000
a5ddd4efa9 Update hilbertshotel.dm 2020-01-24 00:01:02 -07:00
loginsandylogout
a7a3a3a417 Update code/modules/spells/spell_types/lightning.dm 
po

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-01-23 22:52:18 -06:00
Ghommie
6677e82195 Turf magic and people spamclicking. 2020-01-24 05:19:47 +01:00
Ghommie
a6c3917bfc M H M H 2020-01-24 05:01:51 +01:00
Ghommie
95a2479c6a Additional runtime fixes. 2020-01-24 04:59:56 +01:00
Ghommie
bd6e364612 But wait, there is more! 
No...
 2020-01-24 04:33:55 +01:00
Ghommie
1ba4c19c64 A couple more. 2020-01-24 03:50:44 +01:00
Ghommie
67f58b8a59 A few more runtime fixes. 2020-01-24 03:30:34 +01:00
Seris02
90c7149d8c merge conflict fixes 2020-01-24 10:27:48 +08:00
kevinz000
99d6d589ac Update hilbertshotel.dm 2020-01-23 19:07:39 -07:00
kevinz000
65871ca1d3 Update hilbertshotel.dm 2020-01-23 19:07:17 -07:00
kevinz000
5ce80078ab Update hilbertshotel.dm 2020-01-23 19:03:26 -07:00
Ghommie
721fd108f9 A few more, ported, runtime fixes. 2020-01-24 03:02:07 +01:00
Ghommie
9ee70c7931 Travis is just faster at compiling, I can work on other things meanwhile 2020-01-24 02:34:32 +01:00
Ghommie
7d5725e450 a dot 2020-01-24 02:31:46 +01:00
Ghommie
78934c52fe A handful of runtime fixes. 2020-01-24 02:27:06 +01:00
Ghommie
ba2c149d4d Improvements. 2020-01-24 02:22:32 +01:00
Ghommie
6b62aef86c Missing ! 2020-01-24 02:19:52 +01:00
Ghommie
524f665f4a fix for hypospray jank. 2020-01-24 02:17:41 +01:00
Ghommie
05150e821e A few consistencies for those "shoes" that don't actually cover feet. 2020-01-24 01:25:23 +01:00
Ghommie
8e5f221bb9 Ports "Makes falsewall hide pipes and wires" 2020-01-24 00:57:27 +01:00
Ghommie
c8bf148216 snowflake-friendly towels. 2020-01-24 00:06:07 +01:00
Ghommie
3211ed6d10 Better position. 2020-01-23 23:19:39 +01:00
Ghommie
56d31b0c8c neuter/plural gender fixes. 2020-01-23 22:50:30 +01:00
Trilbyspaceclone
9466b0f4ca Merge branch 'master' into glassware 2020-01-23 13:31:04 -05:00
Ghom
14a33ee7dc Merge pull request #10651 from r4d6/Soft-rad-suit 
Make the radiation hardsuit a voidsuit instead
 2020-01-23 19:23:09 +01:00
Ghommie
292aaa58dc Fixes dead malf AI doomsday, a few ported updates. 2020-01-23 17:36:23 +01:00
Kraseo
14b7711590 i will end whoever ported virgo hairs and thought it was fine to do it like that 2020-01-23 17:29:21 +01:00
Ghom
21867f60dd Merge pull request #10598 from Putnam3145/metabolic-synth-tweak 
Made metabolic synthesis nanites stop if not fed
 2020-01-23 16:38:39 +01:00
Ghom
86a3a5dd4d Merge pull request #10610 from Owai-Seek/bountytweaks 
Some Bounty Tweaks
 2020-01-23 15:44:00 +01:00
Ghom
f3b9b20e57 Merge pull request #10672 from BlackMajor/master 
Fixes a donor sprite.
 2020-01-23 15:30:29 +01:00
Unknown
bd8ce9a7b6 Culturally Appropriate Lunar Clothes 2020-01-23 06:35:50 -07:00
BlackMajor
77e7dff11b Webedit PR man bad 2020-01-24 01:41:40 +13:00
Winter Flare
3d85499919 Requested Changes + Nerf 
Nerf cannabis bounties, comment out monkey cube bounty, change to shady jims.
 2020-01-23 07:20:22 -05:00
BlackMajor
5fb2e60ebf Merge branch 'master' into master 2020-01-24 00:50:46 +13:00
kevinz000
83591f8883 Merge pull request #10620 from Hatterhat/patch-1 
exo suit nerf - melee and bomb armor
 2020-01-23 04:48:06 -07:00
kevinz000
4304a7dd42 Merge pull request #10602 from Ghommie/Ghommie-cit509 
RPD ventcrawler escapism sanity check.
 2020-01-23 04:47:46 -07:00
kevinz000
aa19c2a17b Merge pull request #10603 from Ghommie/Ghommie-cit510 
clockwork cuirass now compatible with snakes. The original author was too lazy.
 2020-01-23 04:47:18 -07:00
kevinz000
1b7265d8c1 Merge pull request #10605 from r4d6/Layer 
Port TG Layers updates and Freezer update
 2020-01-23 04:46:52 -07:00
BlackMajor
7733d3f98a Update robot_modules.dm 2020-01-24 00:42:41 +13:00
kevinz000
88f625edfc Merge pull request #10636 from Ghommie/Ghommie-cit512 
Trilby's solar panels PR but improved.
 2020-01-23 04:35:13 -07:00
kevinz000
a01d7260d8 Merge pull request #10641 from jakeramsay007/Calibers-101 
Revolver caliber changes; .357 revolvers can now also load .38 but not vice-versa.
 2020-01-23 04:34:24 -07:00
Seris02
5499638c5e yes 2020-01-23 15:41:49 +08:00
TrilbySpaceClone
86ea13afeb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into patch-270 2020-01-22 23:00:54 -05:00