cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-18 10:47:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
4603 Commits
Author SHA1 Message Date
Enric Gabriel d2257abe86 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-19 13:21:18 -03:00
siliconsandGitHub 54f48c3754 Merge pull request #13394 from DeltaFire15/attack-runtime-fixes 
Some bodypart-related fixes
 2020-09-19 06:02:32 -07:00
Enric Gabriel d85ebed8db Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-16 16:22:36 -03:00
siliconsandGitHub ca8b13b86a Merge pull request #13255 from timothyteakettle/limbs 
you can choose limbs to be prosthetic/amputated
 2020-09-16 00:31:18 -07:00
SandPootandGitHub 6809afb45c Many borg changes (seriously) (#69) 2020-09-15 23:25:59 -03:00
DeltaFire f892309903 fixes 2020-09-15 17:35:58 +02:00
Timothy Teakettle 744792742b please fix it 2020-09-12 22:32:06 +01:00
Enric Gabriel ef96fd6389 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-11 18:51:33 -03:00
siliconsandGitHub 563b21d8fa Merge pull request #13363 from Putnam3145/bloodsucker-ling-life-code 
Signalizes ling/bloodsucker life code.
 2020-09-11 14:15:37 -07:00
Blue Wildrose 1b77e69fb4 Slimepeople diet changes 2020-09-09 18:11:25 -07:00
Enric Gabriel 242400a5d6 push the files 2020-09-07 20:40:03 -03:00
Enric Gabriel 38c0f8efbd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-07 18:21:54 -03:00
siliconsandGitHub 419eb5ae05 Merge pull request #13360 from KeRSedChaplain/silicon_death_sounds 
Silicon death sounds or "Cease shooting the malfunctioning metal doorknob at the tone"
 2020-09-07 13:42:31 -07:00
Enric Gabriel 1ddcd7669e yes 2020-09-07 16:23:13 -03:00
Enric Gabriel b163c6435d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-07 13:33:45 -03:00
Putnam 12b879c777 oh yeah xenos had handle_changeling (??) 2020-09-07 03:28:39 -07:00
Putnam e75d1a1962 Signalizes ling/bloodsucker life code. 2020-09-07 02:00:22 -07:00
siliconsandGitHub 45ee1cbbf8 Merge pull request #13334 from CameronWoof/revert-12739-DRAKEBORG 
Revert Drakeborgs
 2020-09-06 15:22:16 -07:00
Dan-Neposh db67e6db1f AIs have their own unique sound for death now 2020-09-06 18:02:30 -04:00
Dan-Neposh f4ae266d66 Silicons now have a sound to let you know when your flash spam succeeds 2020-09-06 17:21:52 -04:00
Enric Gabriel 499fec6a16 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-06 10:42:43 -03:00
siliconsandGitHub 9e204f167f Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces 
Miner Loot Shuffle MK III
 2020-09-06 01:58:46 -07:00
Enric Gabriel ad8a55ebbe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-04 23:50:13 -03:00
Putnam3145andGitHub 62fae3515a Merge pull request #13326 from Citadel-Station-13/silicons-patch-29 
radioactive ghosts redux
 2020-09-04 18:07:34 -07:00
Enric Gabriel d286153128 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-04 19:08:14 -03:00
timothyteakettle 90eef6efc9 Merge remote-tracking branch 'upstream/master' into limbs 2020-09-03 22:46:32 +01:00
timothyteakettle 798e11c407 logic 2020-09-03 22:36:38 +01:00
deathride58 1c9a22fa5e Readds the old temperature notification method in the form of a shivering/sweating notification 2020-09-03 01:35:28 -04:00
Cameron!andGitHub e3af0d654e Revert "[READY] DRAKEBORGS & PLUSHIES" 2020-09-02 17:47:22 -07:00
siliconsandGitHub aee7974140 Update astral.dm 2020-08-31 22:34:19 -07:00
Enric Gabriel c4bb4e5873 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-31 21:23:27 -03:00
Blue Wildrose cc9648c08d Update slime.dm 2020-08-30 23:19:18 -07:00
Enric Gabriel c10471fac9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-30 01:42:29 -03:00
TrilbyspacecloneandGitHub 9c8f3305bb Merge branch 'master' into spike-loot-differentces 2020-08-30 00:41:42 -04:00
siliconsandGitHub 84734591ed Merge pull request #13268 from timothyteakettle/accents 
separates tongues speech handling into accent datums
 2020-08-29 21:22:11 -07:00
siliconsandGitHub 7ad037ee53 Merge pull request #13276 from timothyteakettle/emotes 
every emote is unrestricted
 2020-08-29 21:21:01 -07:00
siliconsandGitHub 5f7d80eab2 Merge pull request #13281 from Putnam3145/examine-pref 
Added genital/vore examine text prefs
 2020-08-29 21:19:03 -07:00
Letter N fe17bee28e reverts thing kev said about 2020-08-29 14:36:41 +08:00
Letter N ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
Putnam c7883775fa Added a pref to see genitals on examine. 2020-08-27 20:22:24 -07:00
Timothy Teakettle b3c459c59c okay you can use any emote 2020-08-27 21:04:36 +01:00
Timothy Teakettle 398692df0b emotes 2020-08-27 20:24:37 +01:00
Enric Gabriel 0db4397e7c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-27 14:07:17 -03:00
siliconsandGitHub 857c581931 Merge pull request #13232 from timothyteakettle/is-this-a-good-idea 
adds the ability to pick body sprites (you can choose aquatic/avian sprites as anthromorphs!)
 2020-08-27 09:55:26 -07:00
siliconsandGitHub ec9b82381b Merge pull request #13265 from timothyteakettle/rock-paper-scissors 
adds rock paper scissors
 2020-08-27 09:42:08 -07:00
TrilbyspacecloneandGitHub c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04:00
timothyteakettle 8d6a026153 yep 2020-08-27 00:01:54 +01:00
Enric Gabriel 4028af4f4f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-26 12:24:38 -03:00
siliconsandGitHub 1b30adbf2a Update robot.dm (#13247) 2020-08-26 14:14:33 +02:00
siliconsandGitHub f611fee193 mecha are no longer immune to goliath tentacles (#13172) 
* Update goliath.dm

* Update goliath.dm

* Update goliath.dm
 2020-08-26 13:06:53 +02:00