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,444 Commits 55 Branches 0 Tags
98d23bb87b3f941c0bf879357cc698ccfeb81e2d
Commit Graph

503 Commits

Author SHA1 Message Date
Timothy Teakettle
a7445316ef Update flavor_misc.dm 2021-01-28 02:11:08 +00:00
Timothy Teakettle
337611a372 Merge remote-tracking branch 'upstream/master' into caw-and-gekker 2021-01-28 02:10:11 +00:00
Timothy Teakettle
e130e9c7e2 Update flavor_misc.dm 2021-01-28 02:08:19 +00:00
Artur
66979e2364 Merge branch 'master' into revenant_TK 2021-01-20 18:27:11 +02:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
The0bserver
ffe401544c First wave of fixing 2021-01-13 23:35:37 -05:00
Artur
2f619ffc4e Traits 2021-01-13 10:27:10 +02:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
shellspeed1
98f8af853c Minor xenohybrid changeschanges 
Adds wings, xeno tongue, and makes xenomorphs speak xenohybrid by default
 2021-01-06 01:58:58 -08:00
Timothy Teakettle
813e0f4c79 Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items 2021-01-01 22:30:04 +00:00
Timothy Teakettle
c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
Letter N
47a3afff54 DB stickies 2020-12-23 16:50:48 +08:00
Letter N
61c8f69be8 better telemetry 2020-12-23 15:56:15 +08:00
DeltaFire
65c14cf289 Merge pull request #13537 from silicons/permissions 
support update for event manager permissions
 2020-12-22 16:12:03 +01:00
DeltaFire
282a5d6ab2 aaactually lets just make robots immune in general 2020-11-24 20:32:42 +01:00
DeltaFire
a3208d1ac8 synth alcohol immunity 2020-11-24 20:27:34 +01: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
803bff4e5f funny 2020-11-12 23:34:42 -07:00
DeltaFire
5af48a22dd adds a surgery to fix corruption 2020-11-13 02:24:52 +01:00
DeltaFire
76fe1a77bc Merge remote-tracking branch 'upstream/master' into system-corruption 2020-11-13 01:00:50 +01:00
Artur
503d0156c6 Does the thing 2020-11-08 23:24:58 +02:00
DeltaFire
ed08983b97 syscorruption framework 
Adds a framework for systems corruption instead of toxins damage for use in synthetic species. No ways to deal / heal it yet, nor effects, or actual uses. Soon.
 2020-11-01 04:56:31 +01:00
Tupinambis
3224533a7c Merge branch 'master' into spooder 2020-10-11 14:31:23 -05:00
silicons
7f611a98e1 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-10 22:23:22 -07:00
silicons
737b6460af Merge pull request #13497 from Zandario/species-refactor 
Refactors some defines for easier Species Development
 2020-10-10 22:00:49 -07:00
Timothy Teakettle
385bd57940 reworks family heirlooms, adds heirlooms that can be based off your species (#13444) 
* corgi tracker

* better heirloom system

* typo
 2020-10-10 12:15:39 +02:00
silicons
8e83dcd697 event permissions 2020-10-07 14:43:53 -07:00
silicons
1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07:00
Timothy Teakettle
05aef528d7 finishing touches 2020-10-04 17:33:46 +01:00
Timothy Teakettle
b48f4b91e6 Merge branch 'master' into eye-sprites 2020-10-04 01:23:03 +01:00
timothyteakettle
dc70d17a1e customizable eyes 2020-10-04 01:19:29 +01:00
Timothy Teakettle
0c99b53c05 eyes 2020-10-03 23:22:53 +01:00
Zandario
1620e3887c Merge branch 'master' into species-refactor 2020-10-02 17:19:48 -05:00
Zandario
bdd121cd81 Prep Work 2020-10-02 17:17:50 -05:00
timothyteakettle
318729031c newlines good for the soul 2020-10-02 14:55:39 +01:00
timothyteakettle
158b1d584f woopsy 2020-10-02 14:54:57 +01:00
timothyteakettle
3ba9031fe2 Revert "gender part support" 
This reverts commit 358041c2ef.
 2020-10-02 14:54:05 +01:00
timothyteakettle
358041c2ef gender part support 2020-10-02 14:50:42 +01:00
Tupinambis
d2860b38c7 normalization 2020-10-01 18:46:31 -05:00
Tupinambis
f1bc1ccafb Merge branch 'master' into spooder 
# Conflicts:
#	code/modules/surgery/organs/eyes.dm

I have no idea if this will work
 2020-10-01 17:10:42 -05:00
silicons
1f4e3b9a92 Merge branch 'master' into patch-2 2020-10-01 03:09:38 -07:00
Tupinambis
a3a5fe4c2d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into spooder 2020-09-30 16:07:21 -05:00
Tupinambis
8828440575 fix 2020-09-30 16:06:56 -05:00
Tupinambis
113b84ab50 Ports arachnids from WaspStation 2020-09-30 15:10:17 -05:00
zeroisthebiggay
40f404498d ok 
ok
 2020-09-29 18:51:28 -04:00
silicons
822f1c9bf3 fix 2020-09-27 03:07:51 -07:00
Blue Wildrose
fe712d7e52 traviiiiiis 2020-09-22 20:14:14 -07:00
Blue Wildrose
e920e2855c travis please 2020-09-22 19:23:18 -07:00
Blue Wildrose
3e8572e5e2 Requested by Teak because they didn't want to make a PR for this 2020-09-22 19:10:24 -07:00