cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-23 21:27:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
25296 Commits
Author SHA1 Message Date
Putnam 15b5b77494 Replaced all the references of fusionpower to instability in results. 2020-08-30 03:06:36 -07:00
Putnam 5ba883bfe5 Fixes fusion power text to make sense. 2020-08-30 02:53:46 -07:00
siliconsandGitHub 69f6927275 Update broom.dm (#13058) 2020-08-30 09:52:54 +02:00
TrilbyspacecloneandGitHub da641c9b96 Update necropolis_chests.dm 2020-08-30 02:10:59 -04:00
Putnam 66899faa72 needs that var/ 2020-08-29 23:10:13 -07:00
Putnam 3097c790b8 Added an extra test. 2020-08-29 23:02:18 -07:00
Putnam e97ef2d84d Added a character saving unit test. 2020-08-29 22:58:04 -07:00
raspy-on-osu c90c46a2d1 mob_spawners 2020-08-30 01:50:55 -04:00
siliconsandGitHub a8f920f88c Update _lists.dm 2020-08-29 22:48:26 -07:00
Putnam3145andGitHub 7c5197f383 Merge pull request #13249 from Citadel-Station-13/silicons-patch-25 
removes firedoor autoopen on touch
 2020-08-29 22:34:43 -07:00
Enric Gabriel 2cede2e06f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-30 01:42:50 -03: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 bf27de1aec Merge pull request #13292 from Putnam3145/fix-dynamic-again 
Rolling dynamic tweaks 'til it works
 2020-08-29 21:41:06 -07:00
siliconsandGitHub d4bc6f9fee Merge pull request #13298 from DeltaFire15/eminence-updates 
Modifies the Eminence teleport-to abilties a bit
 2020-08-29 21:40:22 -07:00
siliconsandGitHub 1ed712d69d Merge pull request #13302 from necromanceranne/mecha_backstab_fix_port 
ports #52214 from /tg/: fix for mecha backstabbing
 2020-08-29 21:40:13 -07:00
siliconsandGitHub 05b5d39732 Update ballistic.dm 2020-08-29 21:38:45 -07:00
siliconsandGitHub bf678a25da Merge pull request #13024 from zeroisthebiggay/saltprfuckwaffles 
The PR That Comments Out Waffleco From Appearing AKA Fuck The Traitors ERPing Every Single Round
 2020-08-29 21:35:58 -07:00
Tupinambis 39eac62dcd moves growth pills and genital autosurgeons to the kinkmate 2020-08-29 23:35:35 -05:00
siliconsandGitHub 9250a6d71d Merge pull request #13275 from Chiirno/portable-chem-mixer 
Portable chem mixer
 2020-08-29 21:34:57 -07:00
siliconsandGitHub 16fec8831a Merge pull request #13230 from Detective-Google/reskin-obj 
reskin_obj is now a radial
 2020-08-29 21:33:28 -07:00
siliconsandGitHub 5f40c2da37 Merge pull request #13229 from Sonic121x/patch-2 
Fix Tea and give them a glass sprite
 2020-08-29 21:33:21 -07:00
siliconsandGitHub 413ccdba96 Merge pull request #13192 from Putnam3145/literal-hugbox 
Buffs/hugboxes slaughter demons
 2020-08-29 21:32:58 -07:00
siliconsandGitHub 033feebcd0 Merge pull request #12957 from kappa-sama/patch-34 
removes malf disk from tendril loot
 2020-08-29 21:31:24 -07:00
siliconsandGitHub 50cf863501 Merge pull request #13263 from raspy-on-osu/tesla-groundingrodspull 
Tesla Counterplay.
 2020-08-29 21:24:41 -07:00
GrayRachnidandGitHub 1234b51e82 Revert "Buffs defib users by making them stop pulling automatically" 2020-08-30 00:24:31 -04:00
siliconsandGitHub 4a3b6054d3 Merge pull request #13266 from Ghommie/Ghommie-cit836 
Fixing some mistakes with the priority overlays removal PR.
 2020-08-29 21:22:44 -07:00
siliconsandGitHub 8cc84152d8 Merge pull request #13267 from Arturlang/op_slimes 
Lets slime damage structures
 2020-08-29 21:22:27 -07: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 78b8072d13 Merge pull request #13272 from Detective-Google/patch-1 
plasmamen are playable now
 2020-08-29 21:21:23 -07:00
siliconsandGitHub 7ad037ee53 Merge pull request #13276 from timothyteakettle/emotes 
every emote is unrestricted
 2020-08-29 21:21:01 -07:00
siliconsandGitHub e677804bd7 Merge pull request #13277 from Chiirno/AnaPanRework 
Reworks Anatomic Panacea
 2020-08-29 21:19:47 -07:00
siliconsandGitHub e16abbc945 Merge pull request #13280 from raspy-on-osu/teg-castration-2 
Further tweaks the TEG's power output
 2020-08-29 21:19:18 -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
siliconsandGitHub ad1ab7c7c4 Merge pull request #13290 from ForrestWick/funnynoclip 
Nukies can't get wall-boots anymore
 2020-08-29 21:17:26 -07:00
Putnam 669bab841c Made cost being more than threat delta more punished. 2020-08-29 20:44:45 -07:00
Putnam 19b856aebf Removed story's curve. 2020-08-29 20:23:11 -07:00
siliconsandGitHub bbb5c076c5 Update defib.dm 2020-08-29 20:05:55 -07:00
necromanceranne a0adc984cd ports #52214 from /tg/ 2020-08-30 12:19:38 +10:00
Putnam dd6be82e06 Made heretics scale dynamic threat with power. 2020-08-29 18:43:15 -07:00
siliconsandGitHub 2c3b268aa6 Update meteors.dm 2020-08-29 18:42:46 -07:00
siliconsandGitHub a251648f28 Update meteors.dm 2020-08-29 18:39:50 -07:00
Putnam d8d67d3d3e And fixed their antag flag, too 2020-08-29 16:51:57 -07:00
Putnam 64e379c7ed Added property weights to latejoin heretics, too 2020-08-29 16:51:38 -07:00
Putnam 9a4c76e787 Added property weights to heretic, too. 2020-08-29 16:47:07 -07:00
Putnam 6725ced453 Makes heretics actually able to be edited in the config. 2020-08-29 16:45:16 -07:00
Enric Gabriel 6ae97d5991 quick little make ip clickable 2020-08-29 17:11:25 -03:00
DeltaFire 105c98d12f eminence moment 
commants out 'teleport to ark', gives the Eminence the ability to teleport to obelisks instead.
 2020-08-29 21:30:20 +02:00
Enric Gabriel ab3488628d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-29 15:47:34 -03:00
SandPootandGitHub 89a55525f5 [TESTMERGE] New tgs commands + modification of a existant one (#58) 2020-08-29 15:45:02 -03:00