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-25 09:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,497 Commits 55 Branches 0 Tags
901b54b7e8d79d59eb51b9387d2bf4d4aaa1628c
Commit Graph

6963 Commits

Author SHA1 Message Date
Seris02
6af421994a yay 2020-02-08 13:53:43 +08:00
Ghom
1dfba9f416 Merge pull request #10957 from Putnam3145/fix-occasional-dynamic-runtime 
Fixes a spurious dynamic runtime if nobody votes
 2020-02-07 22:41:48 +01:00
Lin
5717700146 Merge pull request #10925 from Ghommie/Ghommie-cit558 
runtime is forever, errors are eternal.
 2020-02-07 17:29:49 +00:00
Putnam
b4faac50a9 yeah "null" is bad juju. why did i do that 2020-02-07 04:41:16 -08:00
Seris02
4ec99a38e2 merge fixes 2020-02-07 15:28:05 +08:00
kevinz000
4e2e411dd0 Merge pull request #10929 from Ghommie/Ghommie-cit559 
Double-esword and hypereuplastic blade toys are now blunt.
 2020-02-06 23:51:17 -07:00
Ghom
cee2410091 Merge pull request #10922 from Citadel-Station-13/kevinz000-patch-5 
renames the lawyer cartridge to something more accurate to its function
 2020-02-07 05:53:09 +01:00
Ghommie
86c472eaf6 the holopad fix. 2020-02-07 03:17:00 +01:00
kevinz000
62b0e62952 Merge pull request #10623 from Putnam3145/antag-overhaul 
Better antag objectives: for real this time
 2020-02-06 16:25:22 -07:00
Ghommie
0703c6eea6 First tweak to cargo reagents selling. 2020-02-06 22:34:54 +01:00
Ghom
ce6b37da1e Merge pull request #10920 from Arturlang/debbuging 
Adds vscode debbuging
 2020-02-06 20:33:21 +01:00
Arturlang
0353f1602d Fixes ore boxes 2020-02-06 20:10:02 +01:00
Artur
c9dc35fd9a Updates the debug outfit 2020-02-06 18:42:23 +01:00
kevinz000
75d3a8b35d Merge pull request #10868 from Citadel-Station-13/Ghommie-patch-4 
Holofans visual tweak.
 2020-02-06 00:42:39 -07:00
kevinz000
38536cd02d repath that 2020-02-06 00:05:07 -07:00
kevinz000
9a4432b3ac initial commit 2020-02-06 00:03:17 -07:00
kevinz000
927b9d0622 Revert "Merge pull request #10883 from ancientpower/ghost-newscasters" 
This reverts commit 3c5a3cb4d4, reversing
changes made to 109b15ebdd.
 2020-02-05 23:50:41 -07:00
kevinz000
3c5a3cb4d4 Merge pull request #10883 from ancientpower/ghost-newscasters 
Allows ghosts to read newscasters and books
 2020-02-05 23:46:04 -07:00
kevinz000
e0dd12ecbd Merge pull request #10902 from Citadel-Station-13/Ghommie-patch-1 
Fixes some mounted defibrillator issue.
 2020-02-05 23:45:45 -07:00
kevinz000
50cabc3c64 Merge pull request #10889 from Ghommie/Ghommie-cit555 
runtime drifting
 2020-02-05 23:44:52 -07:00
kevinz000
d0cd33a5ea Merge pull request #10899 from Trilbyspaceclone/vender-hate 
Almost all venders now can be restocked
 2020-02-05 23:44:30 -07:00
Ghommie
8131a60f3a Oh. 2020-02-06 02:10:03 +01:00
Ghommie
523e080f87 Double-esword and hypereuplastic blade toys are sharp now blunt. 2020-02-06 02:09:27 +01:00
Ghommie
a3e2ec372f Makes it compile also custom emote fix. 2020-02-06 01:40:14 +01:00
Ghommie
233ed5873f race conditions and turfs beings special. 2020-02-06 01:13:28 +01:00
keronshb
5d1d652ea4 Buffs the Pirate Ship to be bomb proof 
Title, also makes a few computers/machines indestructible and buffs turret health.  It also allows turrets to be repairable now.
 2020-02-05 18:28:00 -05:00
Ghommie
ab06c23a2b runtime is forever, errors are eternal. 2020-02-05 23:48:17 +01:00
kevinz000
98c721fffc Update cart.dm 2020-02-05 13:29:31 -07:00
Artur
c2b68d0ba3 Adds debbuging 2020-02-05 20:35:24 +01:00
Seris02
d0100345fd done hopefully 2020-02-05 17:00:38 +08:00
Seris02
6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
Tupinambis
3539fa7603 Stunbaton PR had bad math didn't properly reduce effectiveness oops. 2020-02-05 00:31:54 -06:00
Ghom
77eb7b8a96 Merge pull request #10812 from Tupinambis/StunbatonFUNCTIONAL 
Stunbaton Balance Adjustments 2.0 (Unfucked Edition)
 2020-02-05 07:02:11 +01:00
Ghom
472bddb5be Merge pull request #10869 from kevinz000/WHY 
can we talk about how admin attack logs being viewable in game is not a good thing, alternatively "i want a word with whoever coded mech logging"
 2020-02-05 06:52:20 +01:00
Ghom
ee2ab7c9f0 Update defibrillator_mount.dm 2020-02-04 23:51:55 +01:00
Ghom
3cd6cfb7d5 Update defibrillator_mount.dm 2020-02-04 23:50:33 +01:00
TrilbySpaceClone
06fd6645b3 And it wokrs 2020-02-04 16:01:22 -05:00
Lin
66638a39b7 Merge pull request #10851 from Citadel-Station-13/Ghommie-patch-3 
Fixing little blood bank gnerator examine runtime error.
 2020-02-04 20:36:28 +00:00
kevinz000
13df3dbb05 Merge pull request #10867 from Ghommie/Ghommie-cit551 
Further buff and fix to the clown ops' tearstache grenade.
 2020-02-04 03:55:22 -07:00
kevinz000
275b1f73e0 Merge pull request #10849 from Ghommie/Ghommie-cit547 
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
 2020-02-04 03:39:14 -07:00
kevinz000
66fc2e77f0 Merge pull request #10865 from Ghommie/Ghommie-cit550 
Demodularizes and nerfs magnetic rifles/pistols with power cell requirements.
 2020-02-04 03:35:33 -07:00
kevinz000
f5cd0cf48f Merge pull request #10872 from Arturlang/reflective_ornot 
Makes shield no longer block energy projectiles and be destroyed when damaged too much.
 2020-02-04 03:34:16 -07:00
kevinz000
b34d6cba0c Merge pull request #10864 from Citadel-Station-13/Ghommie-patch-1 
Hello subtler roleplayers, I see you.
 2020-02-04 03:33:14 -07:00
kevinz000
8f83e8c107 Merge pull request #10860 from deathride58/combatmodeclickdrag 
Makes quick item usage (click-dragging unequipped item) require combat mode
 2020-02-04 03:32:39 -07:00
kevinz000
97583bd98f Merge pull request #10853 from Ghommie/Ghommie-cit549 
A PR about runtime errors
 2020-02-04 03:20:34 -07:00
Seris02
49f80d52a8 bug fixes 2020-02-04 17:18:45 +08:00
Ghommie
a0caada859 runtime drifting 2020-02-04 08:05:27 +01:00
Ghom
6de00c21f0 Update dna_console.dm 2020-02-04 04:11:21 +01:00
ancientpower
5aecdb6a4d initial commit 2020-02-03 20:10:39 -06:00
kevinz000
24b2bb06bf Update mecha_equipment.dm 2020-02-03 13:17:50 -07:00