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 2026-01-01 20:54:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,726 Commits 55 Branches 0 Tags
ead2be5116f1de99682300947066a64be8d5eef8
Commit Graph

19112 Commits

Author SHA1 Message Date
kevinz000
ead2be5116 Merge pull request #10919 from Ghommie/Ghommie-cit556 
Fixing accidental nerfs to the magpistol.
 2020-02-06 00:36:59 -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
cda01e10f6 Merge pull request #10885 from Ghommie/Ghommie-cit553 
Removing a couple troublesome NSFW useless and unused preferences.
 2020-02-05 23:45:30 -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
kevinz000
27d3fcf5fd Merge pull request #10900 from Putnam3145/port-atmos-fix 
Ports atmos priority reaction mix from TG
 2020-02-05 23:44:08 -07:00
kevinz000
5059c0fa8c Merge pull request #10905 from Hatterhat/engishit 
consoleless interfaces default, standard RCD ammo added to industrial engi
 2020-02-05 23:43:54 -07:00
kevinz000
51bc7a5dec Merge pull request #10909 from Citadel-Station-13/Ghommie-patch-3 
Fixes the panic bunker persistence.
 2020-02-05 23:43:05 -07:00
Ghom
181944bb36 Update admin_ranks.dm 2020-02-06 03:07:42 +01:00
Hatterhat
f100b6c5e4 multitools in basic tools, dumb headers 2020-02-05 19:47:20 -06:00
Ghom
6d78d01612 Merge pull request #10903 from Hatterhat/tg-47770 
fuck organ decay - tgstation#47770
 2020-02-05 19:26:40 +01:00
Ghom
69c4cde323 Merge pull request #10915 from Citadel-Station-13/kevinz000-patch-5 
jackboot magpistols are a thing again
 2020-02-05 19:22:36 +01:00
Ghom
deb1686ce2 Merge pull request #10911 from Tupinambis/StunbatonFUCK 
Addendum to PR #10812. REGEN STAMINA WHATEVER FUCK COMBAT REWORK IS CONFUSING
 2020-02-05 19:19:41 +01:00
Ghommie
7e2ad2b71f Fixing accidental nerfs to the magpistol. 2020-02-05 18:45:15 +01:00
Ghom
7e8bc10b8e Merge pull request #10894 from Trilbyspaceclone/carps 
Buffs carps again
 2020-02-05 18:32:18 +01:00
kevinz000
a45038d214 Update pockets.dm 2020-02-05 03:31:55 -07:00
kevinz000
f05d37b7fd Merge pull request #10855 from Trilbyspaceclone/patch-274 
The Syndicats are run by aliens - Fixes Alien cargo crate to be  correction emag
 2020-02-05 01:10:21 -07:00
Ghom
02d1761c0a Merge pull request #10747 from Citadel-Station-13/kevinz000-patch-11 
shoving someone into a wall on the second shove now also disarms their weapon
 2020-02-05 07:38:14 +01:00
Ghom
4cdade4b2d Merge pull request #10788 from Seris02/crushboots 
crushing magboots for tators
 2020-02-05 07:36:14 +01:00
Tupinambis
3539fa7603 Stunbaton PR had bad math didn't properly reduce effectiveness oops. 2020-02-05 00:31:54 -06:00
Ghom
402283e86a Merge pull request #10791 from Arturlang/more_bloodsucker_tweaks 
[READY] Further tweaks to bloodsuckers
 2020-02-05 07:23:36 +01:00
Ghom
4b1e3d216f Merge pull request #10583 from Putnam3145/arousal-tweaks 
Consent logging
 2020-02-05 07:19:37 +01:00
Ghom
68cbc3487a Update species.dm 2020-02-05 07:09:55 +01: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
Trilbyspaceclone
1547f99ddb Update carp.dm 2020-02-05 00:59:16 -05: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
aaa45f102e Merge pull request #10875 from ancientpower/m-bunny-ears 
Adds bunny ear style for humans and anthromorphs
 2020-02-05 06:50:10 +01:00
Ghom
6159c197bb Update persistence.dm 2020-02-05 06:30:50 +01:00
Ghom
57ac5c3d66 Update carp.dm 2020-02-05 06:12:57 +01:00
Trilbyspaceclone
4ecbd1e407 Update carp.dm 2020-02-04 22:00:33 -05:00
Trilbyspaceclone
fb2498781c Update carp.dm 2020-02-04 20:29:50 -05:00
Ghom
b4ba381b59 Merge pull request #10739 from r4d6/Dwarven_Language 
Add a Dwarf Language
 2020-02-05 02:03:42 +01:00
Hatterhat
6efe0dc273 haha what if i made everything interfacable 2020-02-04 18:55:19 -06:00
Hatterhat
385aea3d14 rcd ammo to indeng, typo 2020-02-04 18:50:09 -06:00
Hatterhat
fe717597da fuck fermichem 2020-02-04 18:35:26 -06:00
Ghom
642a8c4217 Merge pull request #10893 from Arturlang/TGUI_Next_Crafting 
[READY]TGUI Next Crafting
 2020-02-05 00:04:21 +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
Putnam
d2f1069764 Ported atmos reaction priority fix 2020-02-04 14:32:39 -08:00
Trilbyspaceclone
b7613a43ae corrects this missing sprite 2020-02-04 16:23:36 -05: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
Lin
e8ea16c3f2 Merge pull request #10874 from Citadel-Station-13/Ghommie-patch-6 
Fixes the petting element.
 2020-02-04 20:34:59 +00:00
Ghom
c24ffa8f1c Merge pull request #10840 from Putnam3145/easier_bunker 
Save panic bunker between rounds
 2020-02-04 21:15:37 +01:00
Ghom
fc7c900cde Update death.dm 2020-02-04 20:51:01 +01:00
Ghom
56ef22f472 Update death.dm 2020-02-04 20:49:49 +01:00
Trilbyspaceclone
8458340541 Update science.dm 2020-02-04 14:38:24 -05:00
TrilbySpaceClone
f66d401516 forgot to move the var 2020-02-04 07:16:15 -05:00
Artur
614a44ea18 Merge remote-tracking branch 'upstream/master' into TGUI_Next_Crafting 2020-02-04 13:11:02 +01:00