cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-07-21 21:25:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph

16840 Commits

Author SHA1 Message Date
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
silicons 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
silicons 07b28f40de Merge pull request #13359 from Ghommie/Ghommie-cit838 
Turf visuals fix plus corrected names of a couple things.
 2020-09-07 13:42:05 -07:00
Enric Gabriel 1ddcd7669e yes 2020-09-07 16:23:13 -03:00
DeltaFire f92b68d591 oh. 2020-09-07 21:12:19 +02: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
silicons 1d8a030070 Update projectile.dm 2020-09-07 05:36:51 -07:00
Putnam 12b879c777 oh yeah xenos had handle_changeling (??) 2020-09-07 03:28:39 -07:00
Putnam c9a5a9dd8e thanks byond strings, very cool 2020-09-07 02:20:54 -07:00
Putnam e75d1a1962 Signalizes ling/bloodsucker life code. 2020-09-07 02:00:22 -07:00
Putnam b9bbdfdedf Fixes genital fuid production. 2020-09-07 01:23:31 -07:00
timothyteakettle 2bb19003a0 thanks kevin 2020-09-07 01:47:30 +01:00
silicons 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
Timothy Teakettle 98a7332e23 is this really the root of the issue 2020-09-06 21:02:24 +01:00
DeltaFire15 cf61133476 typofix (#13358) 2020-09-06 20:43:19 +02:00
Timothy Teakettle 8fe55e1317 travis what the fuck 2020-09-06 19:16:30 +01:00
Timothy Teakettle d51fb00ebf makes more sense this way 2020-09-06 18:57:17 +01:00
Timothy Teakettle 5f5455add1 yes 2020-09-06 18:48:59 +01:00
Ghommie 4a04b22b72 Turf visuals fix plus corrected names of a couple things. 2020-09-06 18:53:01 +02: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
silicons 9e204f167f Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces 
Miner Loot Shuffle MK III
 2020-09-06 01:58:46 -07:00
Letter N fd2ec66757 Ports "Fix bicon(icon2html) showing full dmis, fix asset cache hashes being incorrect." (#13347) 2020-09-06 09:23:28 +02:00
BlackMajor 8b59b4a80d Merge pull request #13332 from Citadel-Station-13/silicons-patch-31 
makes magweapons emp-immune
 2020-09-06 18:05:34 +12:00
BlackMajor 75e38edb43 Merge pull request #13287 from Citadel-Station-13/revert-13122-haha 
Reverts load delays because it's still a problem and by god am I just done at this point
 2020-09-06 18:01:09 +12:00
BlackMajor 1943a2fdd7 Merge pull request #13246 from silicons/anomaly_manufacturing 
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
 2020-09-06 17:53:35 +12:00
BlackMajor fb531e88d8 Merge pull request #13073 from Citadel-Station-13/silicons-patch-84 
you can no longer attack people with surgical tools if you are in help intent
 2020-09-06 17:49:35 +12:00
Enric Gabriel ec16d5e6b2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-05 23:14:58 -03:00
The0bserver 4dacbbb0a9 deeper brass color™ (and damage) 2020-09-05 20:34:49 -04:00
lolman360 280e3e22a3 Update smithed_items.dm 2020-09-06 10:23:58 +10:00
The0bserver de8ed28f2c cat roomba.jpg 2020-09-05 19:14:51 -04:00
The0bserver cddd46fce3 Maybe this will work. Maybe it won't. 2020-09-05 18:52:20 -04:00
silicons de8067761a Update meteor_wave.dm 2020-09-05 13:12:45 -07:00
silicons 4b9b68f398 Merge pull request #13311 from Putnam3145/fix-pool-reagents 
Makes pool actually check for reagents
 2020-09-05 13:11:39 -07:00
Timothy Teakettle de640254c7 tidyup 2020-09-05 20:32:22 +01:00
Enric Gabriel 20b25372e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-05 13:09:14 -03:00
Putnam3145 d6127d71a8 Merge pull request #13352 from timothyteakettle/fix-accents-but-pushed-this-time 
lets ipcs talk but i actually push my changes this time
 2020-09-05 08:40:31 -07:00
Timothy Teakettle c690e59085 change accent names 2020-09-05 16:26:55 +01:00
Trilbyspaceclone 917dfdd403 Update alcohol_reagents.dm 2020-09-05 10:38:32 -04:00
silicons 7b50b22c7b Merge pull request #13244 from lolman360/AnPrimAssistants 
Blacksmithing 2: Anarcho-Primitivist Assistants (travis don't fail on me now)
 2020-09-05 02:20:11 -07:00
silicons e110945568 Merge pull request #13289 from kiwedespars/heretics-touchup 
heretics touchup
 2020-09-05 02:15:21 -07:00
silicons a58a67f90c Merge pull request #13339 from Putnam3145/dynamic-event-decouples 
Completely decouples events from dynamic.
 2020-09-05 02:12:00 -07:00
silicons 0efc5bdaed Merge pull request #13341 from Putnam3145/brain-trauma-nerf 
Nerfs random brain trauma a good deal.
 2020-09-05 02:11:40 -07:00
silicons 7aa2a89243 Update reagent_containers.dm 2020-09-05 00:23:30 -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
Putnam3145 62fae3515a Merge pull request #13326 from Citadel-Station-13/silicons-patch-29 
radioactive ghosts redux
 2020-09-04 18:07:34 -07:00
Putnam 288104a22b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into fix-monstermos-superconduct 2020-09-04 17:26:40 -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
silicons dba1f6af23 Merge pull request #13321 from Putnam3145/fix-ghost-dorm 
Makes ghost dojo hilbert hotel's numbers less trivially deducible.
 2020-09-04 12:56:50 -07:00