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-26 01:33:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,182 Commits 55 Branches 0 Tags
cd5317d1375d6e4efc901b807b9f52f52460699b
Commit Graph

7677 Commits

Author SHA1 Message Date
deathride58
b9d5beeefd Merge pull request #7932 from Trilbyspaceclone/racec 
[Ready] Adds the abilty to make 3 lesser race tonics
 2019-01-21 19:47:48 -05:00
deathride58
6719cf4b52 Merge pull request #7924 from Trilbyspaceclone/paperwork 
[Ready] Makes paper work for cargo to do for spare credits!
 2019-01-21 19:46:58 -05:00
deathride58
2cd500de04 Merge pull request #7925 from Citadel-Station-13/kevinz000-patch-15 
Radioactive Teleport Armor - Everyone Dies Edition
 2019-01-21 19:45:51 -05:00
Trilbyspaceclone
da7dbe6204 Update packs.dm 2019-01-20 17:34:15 -05:00
deathride58
2b852a4dec Update code/modules/crafting/recipes.dm 
Finnnnneeeee

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2019-01-20 17:32:56 -05:00
deathride58
08601b75f6 Merge pull request #7939 from Citadel-Station-13/kevinz000-patch-5 
Disables crayon powder coloring mobs
 2019-01-20 02:46:56 -05:00
BlackMajor
454f672e34 Why isn't the compact shotgun compact 
-Changes the wardens compact combat shotgun to fit in backpacks.

No really, a sawed off riot shotgun fits in a backpack and holds more ammo. Any Warden worth their salt just swaps shotguns, you'd think a "Compact" shotgun would be able to fit much the same considering the lower ammo count.
 2019-01-16 19:54:58 +13:00
kevinz000
93acbf0a1d Update other_reagents.dm 2019-01-15 19:51:08 -08:00
nik707
4c8b2cfd7b Merge pull request #7922 from deathride58/fixesmajorgamebreakingbug 
fixes a very major bug that makes the game extremely unplayable
 2019-01-14 22:24:22 -06:00
nik707
62b177ea7c Merge pull request #7919 from deathride58/animatedthrows 
fancy throws - makes throws perform the attack animation and play a sound
 2019-01-14 22:21:43 -06:00
nik707
a01f949623 Merge pull request #7921 from deathride58/fancierdisposalnoises 
Immersive disposals - Things in disposals will now make sounds when hitting corners
 2019-01-14 22:21:03 -06:00
deathride58
579a729a02 Merge pull request #7930 from Citadel-Station-13/nik707-patch-1 
Completely tested and working TEG nerf
 2019-01-14 22:09:43 -05:00
deathride58
282dabc498 Merge pull request #7928 from Citadel-Station-13/kevinz000-patch-19 
Fixes an edge case regarding mind initialization firing while being gibbed by an explosion
 2019-01-14 22:04:02 -05:00
deathride58
0a8e288ae0 Merge pull request #7914 from Ghommie/Ghommie-cit1 
Minor reagent_containers clean up on hydroitemdefines.dm
 2019-01-14 21:52:02 -05:00
deathride58
dab87b1b43 Merge pull request #7909 from Trilbyspaceclone/patch-46 
[Ready] Makes engivender more usefull and adds a few more coin items
 2019-01-14 21:48:50 -05:00
deathride58
a877e796d4 Merge pull request #7890 from Ragolution/endrapen 
Suicide Messages, Combat Messages, Uniforms Recovered
 2019-01-14 21:39:02 -05:00
deathride58
5ebc570c7a Merge pull request #7888 from Citadel-Station-13/kevinz000-patch-5 
Reworks ephedrine
 2019-01-14 21:37:45 -05:00
deathride58
9047538620 Merge pull request #7884 from Citadel-Station-13/kevinz000-patch-13 
Readds drones
 2019-01-14 21:36:37 -05:00
Trilbyspaceclone
910c79efdf sure thing 2019-01-13 13:27:14 -05:00
Trilbyspaceclone
d4b6da5d6e Update others.dm 2019-01-13 12:16:25 -05:00
nik707
f5382b4ff6 absolutely tested 2019-01-13 02:04:46 -06:00
Trilbyspaceclone
913de53760 Update engivend.dm 2019-01-13 01:42:11 -05:00
Trilbyspaceclone
6d9c76ce3a Update engivend.dm 2019-01-13 01:31:20 -05:00
kevinz000
e485dfc812 Update brain.dm 2019-01-12 17:02:58 -08:00
Ragolution
6ba56c7331 Apply suggestions from code reviewer Rag 
Spell checker

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2019-01-12 15:06:38 -05:00
kevinz000
a37684aae2 Update reactive_armour.dm 2019-01-12 10:47:35 -08:00
kevinz000
ac87048678 Update reactive_armour.dm 2019-01-12 10:45:52 -08:00
kevinz000
fc090a462e Update reactive_armour.dm 2019-01-12 10:45:00 -08:00
kevinz000
feeea1ab8c Update reactive_armour.dm 2019-01-12 10:40:16 -08:00
deathride58
50305c70fd Merge pull request #7915 from Citadel-Station-13/kevinz000-patch-19 
Adds some rogue vendor lines that may or may not be referencing how certain people talk in discord.
 2019-01-12 01:18:38 -05:00
deathride58
52c1e483f5 Merge pull request #7901 from Trilbyspaceclone/patch-43 
[Ready] Moves RCLD to a proper place - Requested by Kevs
 2019-01-12 01:13:04 -05:00
Trilbyspaceclone
ba3826af5d Update recipes.dm 2019-01-11 18:23:31 -05:00
Trilbyspaceclone
1e425c7e40 Update packs.dm 2019-01-11 18:17:47 -05:00
Trilbyspaceclone
165967416e Update manifest.dm 2019-01-11 18:07:39 -05:00
Trilbyspaceclone
9a6d395197 Update order.dm 2019-01-11 18:06:12 -05:00
Trilbyspaceclone
2a0a57dcd2 Update manifest.dm 2019-01-11 17:56:57 -05:00
deathride58
2fa89d71b3 FIXES A BUG THAT MAKES THE GAME EXTREMELY UNPLAYABLE 2019-01-11 11:40:46 -05:00
deathride58
0f48e77990 makes the sound actually play at the right place 2019-01-11 04:58:11 -05:00
deathride58
37d90a780a all items in disposal pipes now make small sounds when they hit corners. all mobs will make very audible sounds when they hit corners 2019-01-11 04:27:53 -05:00
deathride58
e03cd1e405 fancy throws - makes throws perform the attack animation and play a sound 2019-01-11 02:52:15 -05:00
kevinz000
ab5681e3c8 Update brand_intelligence.dm 2019-01-10 03:00:40 -08:00
Ghommie
0ba384be86 1 2019-01-09 21:18:25 +01:00
Trilbyspaceclone
ae8b026cf2 Update packs.dm 2019-01-08 15:17:02 -05:00
Trilbyspaceclone
7e8ba9a23c [Ready] New adv surgery tools! (#7879) 
* Fixing updater

* Update tools.dm

* Update all_nodes.dm

* Update medical_designs.dm

* shit.jpg

* Update medical_designs.dm

* Update medical_designs.dm

* Apply suggestions from code review

Ragolutions' Grammar rework

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Apply suggestions from code review

Reg being the best

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Huh
 2019-01-08 02:36:43 -08:00
Trilbyspaceclone
c96b6dfee8 [Ready] Hunting, Anitviro and Russian gear crate! (#7796) 
* Cargo

* grammar

* Update packs.dm

* reduce anitviro crate cost

* No fun allowed

* Update packs.dm
 2019-01-08 02:35:41 -08:00
Trilbyspaceclone
6701585888 Update snack.dm (#7899) 2019-01-08 02:35:19 -08:00
Trilbyspaceclone
353713fcee ERT suits shouldnt die to acid (#7897) 2019-01-08 02:30:47 -08:00
Trilbyspaceclone
c2eafa3f73 Adds condiments to the coffie vender with coins! (#7902) 
* Update coffee.dm

* Update coffee.dm

* Would help to double check
 2019-01-08 02:28:24 -08:00
Trilbyspaceclone
79f4b77b4a Update engivend.dm 2019-01-07 21:27:23 -05:00
nik707
31babed81e Merge pull request #7885 from Citadel-Station-13/kevinz000-patch-1 
Frying things that are not food now gives a random bad chemical picked from food poisoning, chlorine trifluoride, and a host of fun chemicals include a potent stimulant that suffocates you.
 2019-01-06 14:27:41 -06:00