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 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,698 Commits 55 Branches 0 Tags
aee2f46b8d00898f3c4849c16ffd651a79ced517
Commit Graph

21251 Commits

Author SHA1 Message Date
kevinz000
aee2f46b8d Merge pull request #11777 from Ghommie/Ghommie-cit670 
Makes RAD_PROTECT_CONTENTS radiation flag protect both ways.
 2020-04-09 02:41:21 -07:00
kevinz000
f60cf32562 Merge pull request #11775 from Trilbyspaceclone/frail-crafting 
Frail crafting - Glass work additions and changes!
 2020-04-09 02:41:01 -07:00
kevinz000
ba4585951e Merge pull request #11765 from Putnam3145/dynamic-chaos-weight 
Makes intrigue, classic, story storytellers have their chaos weighted by recent round chaos
 2020-04-09 02:40:25 -07:00
kevinz000
22bf4cdb83 Merge pull request #11760 from Trilbyspaceclone/10mmchanges 
Stechkin and ASP ammo boxes in uplink and ASP ammo boxes
 2020-04-09 02:38:44 -07:00
kevinz000
779766d1f6 Merge pull request #11759 from Trilbyspaceclone/telecoms 
Makes upgrading telecoms more usefull
 2020-04-09 02:38:10 -07:00
kevinz000
b8548f521b Merge pull request #11746 from Trilbyspaceclone/found_and_hidden 
Atomic PR 1 or 2 - Toilet Mapping!
 2020-04-09 02:11:43 -07: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
kevinz000
9208c42747 Merge pull request #11722 from timothyteakettle/bye-separated-chems 
goodbye separated chemicals
 2020-04-09 02:02:55 -07:00
Putnam3145
474d6a486d Merge pull request #11773 from Arturlang/cablefix 
Fixes cablecuff making producing 0 amount cables
 2020-04-09 01:28:30 -07:00
Artur
0a234d5618 TABS NOT SPACES 
AAAAAAAA
 2020-04-09 09:32:23 +03:00
Artur
75a2dd6900 Finnishing touches, hopefully 
Tweaks some indendation
 2020-04-08 18:32:45 +03:00
Artur
3cf6524389 Makes it nicer, removes check_cable_amount 
Putnam suggested this as well
 2020-04-08 18:28:35 +03:00
Arturlang
cdd2f55cac Putnams suggestion 
Makes use() a if, as to use it as a further sanity check

Co-Authored-By: Putnam3145 <putnam3145@gmail.com>
 2020-04-08 18:24:14 +03:00
necromanceranne
2becb6d74f not really relevant given I literally decided to axe the mod 2020-04-09 00:44:01 +10:00
necromanceranne
ad09cb6790 This needs to go, there is just no way to reasonably have this mod as of the moment while it is basically giving a universal stamina discount. 2020-04-09 00:07:54 +10:00
necromanceranne
f0a738ef21 I'm sneaking in a nerf to scarp here shush shush 2020-04-08 22:53:51 +10:00
Ghommie
fb22a04939 Makes RAD_PROTECT_CONTENTS protect both ways. 2020-04-08 06:00:21 +02:00
Trilbyspaceclone
97dbd6ae7f Update parts.dm 2020-04-07 18:38:53 -04:00
TrilbySpaceClone
b350436fbc working 2020-04-07 18:31:23 -04:00
TrilbySpaceClone
e9d2e798a3 more glasswork 2020-04-07 17:58:23 -04: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
Lin
395d33e54c Merge pull request #11766 from Ghommie/Ghommie-cit699 
Bringing back accidentally reverted solar panel fixes.
 2020-04-07 19:59:48 +00:00
kevinz000
3901049c0d Update shields.dm 2020-04-07 12:50:01 -07:00
necromanceranne
353c6f1348 forgot this bit 2020-04-07 23:35:10 +10: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
TrilbySpaceClone
05582f567f ? 2020-04-07 09:11:20 -04:00
Artur
c9ab705c80 Ghommies suggestion 2020-04-07 16:08:38 +03:00
Putnam
28f77af42e wow that's important 2020-04-07 05:50:00 -07:00
Artur
c4ff1cd322 Coding is hard, mkay? 2020-04-07 14:39:00 +03:00
TrilbySpaceClone
3907a3739c Merge branch 'found_and_hidden' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into found_and_hidden 2020-04-07 07:35:31 -04:00
Putnam3145
dad6ddb042 Merge pull request #11764 from Ghommie/Ghommie-cit668 
Fixing spellcasting and edge cases.
 2020-04-07 02:50:24 -07:00
Putnam3145
536934d1e2 Merge pull request #11770 from Kraseo/i-hate-slimes 
The contractor pod now gives regen jelly instead of omnizine
 2020-04-07 02:43:33 -07:00
kevinz000
557df9f21a Merge pull request #11755 from Trilbyspaceclone/patch-335 
Corrects plastic knife damage
 2020-04-07 02:00:35 -07:00
kevinz000
9c0567027b Merge pull request #11768 from timothyteakettle/uplinks-population-update 
uplink content updates with the current population
 2020-04-07 01:59:58 -07:00
kevinz000
029f8ff698 Merge pull request #11763 from necromanceranne/popcap_time 
Pop caps Sleeping Carp and Rising Bass to 30 players.
 2020-04-07 01:58:14 -07:00
kevinz000
ef2eaf2233 Merge pull request #11753 from KathrinBailey/Small-&-Snug-Changes 
They put me in a padded cell for spriting and porting.
 2020-04-07 01:56:21 -07:00
necromanceranne
b494aa3370 Fixed up how the proc is used, made northstar gloves give you no_softcrit instead of no_hardcrit, you altclick to change the warcry since they're no_drop now 2020-04-07 17:51:25 +10:00
Trilbyspaceclone
def93f14fb Update watercloset.dm 2020-04-07 03:40:00 -04:00
Trilbyspaceclone
a6e07e5427 Merge branch 'master' into found_and_hidden 2020-04-07 03:37:09 -04:00
Putnam
43169aa9d4 Made teamwork also use recent weight. 2020-04-06 23:53:59 -07:00
timothyteakettle
c28aa08c71 woops i didnt add it to the seed 2020-04-07 00:16:28 +01:00
Kraseo
f88d36addf quirky ass slime roundstart races 2020-04-07 01:12:21 +02:00
kevinz000
287fbba4b8 Merge pull request #11758 from Putnam3145/add-ai-facing-message 
[s] Adds a message to AIs when they encounter a certain bug.
 2020-04-06 16:03:56 -07:00
timothyteakettle
1b940a5464 space tobacco now has gaseous 2020-04-07 00:01:27 +01:00
timothyteakettle
378e188b3b goodbye slip prickles 2020-04-06 23:57:00 +01:00
kevinz000
ec237331a4 Merge pull request #11743 from Citadel-Station-13/Ghommie-patch-2-1 
Lil minesweeper edge case.
 2020-04-06 15:48:50 -07:00
kevinz000
ef0b81eabf Merge pull request #11744 from Citadel-Station-13/Ghommie-patch-4 
Fixed the epic nuke exploit
 2020-04-06 15:48:02 -07:00
kevinz000
a53096bdbf Merge pull request #11745 from Trilbyspaceclone/hide_and_seak 
Atomic PR 1 or 2 - Toilet Loot!
 2020-04-06 15:47:39 -07: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
a80e6712b9 Merge pull request #11749 from Putnam3145/organ-conveyance 
Changed how scanners show organ damage.
 2020-04-06 15:46:49 -07:00