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
41,615 Commits 55 Branches 0 Tags
0d2eef3cc4b82fcc9301051cea390c493e7effa3
Commit Graph

1320 Commits

Author SHA1 Message Date
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
silicons
3f4aff09d1 Update code/modules/research/xenobiology/crossbreeding/_status_effects.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-02-05 00:59:19 -07:00
silicons
503d71ea45 Update _status_effects.dm 2021-01-31 18:03:36 -07:00
silicons
a1e92e55aa Merge pull request #14102 from Hatterhat/somatobuff-50513 
[READY] somatoray buff - mutation locks + revolution ray
 2021-01-25 23:17:29 -07:00
Letter N
021b28a2b7 cleanup 
shitcode - b - gone
 2021-01-20 11:08:21 +08:00
Hatterhat
a8cb8b79c6 for one, dont forget the sprites, dumbass 2021-01-19 17:40:34 -06:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
DeltaFire
aa1cae9f33 Merge pull request #14054 from TheObserver-sys/AReturnToForm 
Returns the Maintenance Shotgun to it's original recipe. Removes the Maintenance Rifle, and associated items.
 2021-01-15 18:22:05 +01:00
The0bserver
1b469bdfda The power of overwriting... 2021-01-14 01:03:48 -05:00
silicons
28849dd8e9 Merge pull request #14039 from Hatterhat/sticky-start 
on the precipice of stickiness - sticky tape roundstart tech
 2021-01-13 21:02:23 -07:00
silicons
ae290cf5f0 newlines 2021-01-13 16:56:36 -07:00
silicons
bcb2e16cef Merge pull request #14035 from SiliconMain/baitbegone 
Comments out hololocks
 2021-01-13 16:53:01 -07:00
Hatterhat
b36a1142fe on the precipice of stickiness 2021-01-12 16:58:20 -06:00
Hatterhat
cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06:00
SiliconMain
bc64cedc2d Update misc_nodes.dm 2021-01-12 14:42:35 -06:00
SiliconMain
a26590965e Update misc_designs.dm 2021-01-12 14:41:10 -06:00
Lin
95101ac36a Merge pull request #14013 from Citadel-Station-13/compressor 
lets science actually print explosive compressors
 2021-01-11 00:21:11 +00:00
silicons
fd77be9b89 Update _status_effects.dm 2021-01-09 16:44:56 -07:00
silicons
c36151b4cf Update machine_designs_sci.dm 2021-01-09 15:35:26 -07:00
silicons
b0a94a6e1c Update engineering_nodes.dm 2021-01-09 07:30:14 -07:00
silicons
34c5d99afb Update machine_designs_sci.dm 2021-01-09 07:29:31 -07:00
shellspeed1
04d60c85d9 a 2021-01-09 03:06:48 -08:00
silicons
ccbfd4015e Merge pull request #13934 from shellspeed1/Ports-Navigation-Gigabeacon 
Ports bluespace navigation gigabeacon from TG
 2021-01-03 18:11:10 -07:00
silicons
2641332fb2 Merge pull request #13941 from Chiirno/ChemMixerHotfix 
Portable Chem Mixer now added to the Biological Technology tech node.
 2021-01-03 18:09:50 -07:00
DeltaFire
2ed866d855 boom 2021-01-01 07:22:10 +01:00
Chiirno
218cac1a49 OK, chem mixer has been added to a tech node now. 2020-12-31 22:19:51 -04:00
shellspeed1
45ce0a72a1 Ports bluespace navigation gigabeaconon 
port of https://github.com/tgstation/tgstation/pull/44807
 2020-12-31 01:49:38 -08:00
Lin
3ad777f8f7 Merge pull request #13755 from silicons/colormates 
ports colormates from rp/vorestation
 2020-12-20 18:14:48 +00:00
SandPoot
a0ae0c37fe upload files 2020-12-16 11:39:50 -03:00
silicons
317f33b4e5 fixes 2020-12-11 05:14:23 -07:00
silicons
8f36a1d2ec okay 2020-11-22 15:20:52 -07:00
silicons
18bdda1273 fix 2020-11-22 15:01:19 -07:00
silicons
13ebceb670 why did i do this 2020-11-22 14:56:02 -07:00
silicons
c7e60191df whew 2020-11-22 14:44:05 -07:00
silicons
5ae410790b locking 2020-11-22 14:40:57 -07:00
silicons
37e26833a6 wew 2020-11-22 14:16:14 -07:00
silicons
f8d43b7544 Merge pull request #13679 from DeltaFire15/system-corruption 
[TESTMERGE ONLY] System Corruption for robotic species
 2020-11-18 22:54:51 -07:00
DeltaFire
410ffffcc3 there we go 
robot rad safe: 250, 750 with upgrade (500 for normal mobs)

Also some typo fixes
 2020-11-15 20:30:50 +01:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
Putnam3145
f6b93a242c Makes get_damaged_bodyparts use proper arguments (#13570) 
* you're not being clever, you're being obfuscatory, stop this

* Made get_damaged_bodyparts use proper arguments

* Actually shouldn't have the arg
 2020-10-17 11:44:15 +02:00
DeltaFire
a5fce4b6ed Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2 2020-10-11 15:39:41 +02:00
silicons
d2ce6ca709 Merge pull request #13540 from TheObserver-sys/QoLPass 
Service+Plumbing QoL Pass 1:  Beakers, Belts, Plungers and Pipes
 2020-10-10 22:04:49 -07:00
DeltaFire
4ccf40f775 Revert "Revert "Merge branch 'master' into robotic-limbs-PT2"" 
This reverts commit 27a099c6bf.
 2020-10-11 00:53:18 +02:00
DeltaFire
27a099c6bf Revert "Merge branch 'master' into robotic-limbs-PT2" 
This reverts commit 73b5267425, reversing
changes made to 2e780bfff2.
 2020-10-11 00:51:39 +02:00
DeltaFire
73b5267425 Merge branch 'master' into robotic-limbs-PT2 2020-10-11 00:44:28 +02:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
The0bserver
0d1d94fd06 belt 2020-10-09 01:17:46 -04:00
The0bserver
0d8bea1c9b QoL: Adds BSB's to Service, adds R.Plunger design 2020-10-08 23:27:17 -04:00