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-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,019 Commits 55 Branches 0 Tags
7c50b45e0d1692bde577fe08a5a131c7c4fac35e
Commit Graph

17967 Commits

Author SHA1 Message Date
silicons
540b8c280b Merge pull request #14156 from zeroisthebiggay/cooming 
hair ports part two | now featuring skrell hair
 2021-01-29 07:29:46 -07:00
silicons
e417d72703 Merge pull request #14150 from zeroisthebiggay/ohgodohfuck 
a zero pr that didn't need a followup pr to fix bugs doesn't exist | adds the multicolor berets to loadout
 2021-01-29 07:29:39 -07:00
silicons
4e446bf894 Merge pull request #14154 from timothyteakettle/stop-encoding-twice 
i broke adminpms and this fixes them sorry
 2021-01-28 16:49:51 -07:00
zerothebigboy
0bc3c5292c arooga 2021-01-28 12:31:23 -05:00
Timothy Teakettle
938b924a37 yes 2021-01-28 11:12:27 +00:00
zerothebigboy
c6420ae433 fuck 2021-01-27 22:59:44 -05:00
silicons
1d72a574b2 Merge pull request #14093 from timothyteakettle/rename-redescribe-loadout 
loadout part 3: custom names and descriptions
 2021-01-27 19:09:41 -07:00
silicons
a973a3b088 Merge pull request #14145 from zeroisthebiggay/aeughfuck 
ports some hairstyles from rp because god knows we need some good hairs that aren't Short Hair 3 and Wisp
 2021-01-27 19:08:25 -07:00
silicons
912b09d33b Merge pull request #14146 from zeroisthebiggay/ooffuck 
RP ports featuring accessories, small code fixes, shibari ropes, stockings, and celebrating 2021's animal or whatever
 2021-01-27 19:08:19 -07:00
silicons
af3b237846 Merge pull request #14147 from timothyteakettle/fix-miner-bedsheet 
fixes miner bedsheet
 2021-01-27 19:08:00 -07:00
silicons
f623dde8df Merge pull request #14142 from zeroisthebiggay/sexmask 
adds aesthetic sterile masks (and the paper mask) to the loadout panel
 2021-01-27 19:07:45 -07:00
Lin
f7c1cdc571 Merge pull request #14112 from silicons/ex_act_3 
~~hugboxes~~ fixes the bug (that was probably my fault) that makes 1 dev explosions ALWAYS delete brain
 2021-01-27 17:16:44 -06:00
zerothebigboy
ee74f2c06c here comes fetish content 2021-01-27 15:38:34 -05:00
Timothy Teakettle
6d6b232afe i hate shitcoders 2021-01-27 20:33:14 +00:00
zerothebigboy
f3072433ff thankyoubasedrp 2021-01-27 14:56:26 -05:00
zerothebigboy
ad2864f137 aeughfuck 2021-01-27 13:30:44 -05:00
Putnam3145
8b9551b39c Merge pull request #14056 from Citadel-Station-13/silicons-patch-14 
disables rotatium due to it being horifically bugged and unmaintained
 2021-01-26 22:24:14 -08:00
zeroisthebiggay
0bc8c9383c Update miscellaneous.dm 2021-01-26 13:17:44 -05:00
zerothebigboy
7b2a6955cc please 2021-01-26 13:13:09 -05:00
silicons
efc3ecef32 Merge pull request #14118 from DeltaFire15/slabs-and-silicons 
About ratvarian borgs and spells sometimes not working (+ a few other small things)
 2021-01-25 23:17:41 -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
silicons
6a2ae34ebe Merge pull request #14111 from Arturlang/revenant_TK 
[READY]Gives the revenant TK
 2021-01-25 23:17:09 -07:00
silicons
0c6e67ac81 Merge pull request #14127 from Hatterhat/tg-56348 
tgstation#56348 - contractor TC buff
 2021-01-25 23:04:01 -07:00
silicons
de8d778f76 Merge pull request #14134 from Arturlang/Give_improvements 
[READY]Give Improved
 2021-01-25 23:02:03 -07:00
silicons
36215c5d48 Merge pull request #14136 from shellspeed1/Fixes-infinite-floor-tiles 
Ports a fix for infinite floor tiles from tg caused by a bug that was fixed a long time ago on tg code.
 2021-01-25 23:01:23 -07:00
silicons
46891ee510 Merge pull request #14137 from SandPoot/master 
Dropper can no longer drop things at it's location without having them
 2021-01-25 23:00:53 -07:00
silicons
7b35c80a4d Merge pull request #14117 from timothyteakettle/blob-emote 
lets blobs use the 'me' verb
 2021-01-25 22:59:24 -07:00
silicons
50ad333afe Merge pull request #14116 from timothyteakettle/stop-encoding-twice 
adminhelps and pms only sanitize text once, stopping ' becoming &39;! or whatever
 2021-01-25 22:59:17 -07:00
silicons
6094293b4b Merge pull request #14105 from DeltaFire15/heretic-target-fix 
Heretic sacrifice target logging + a fix
 2021-01-25 22:58:54 -07:00
silicons
8e20e20184 Merge pull request #14059 from Hatterhat/no-corpse-headsets 
removes headsets and flashes from more legion corpses
 2021-01-25 22:58:05 -07:00
SandPoot
6fb5067da4 upload files 2021-01-25 19:40:35 -03:00
Artur
b569d59271 Did the suggestion 2021-01-25 22:07:04 +02:00
shellspeed1
8176bf30ff new line 2021-01-24 21:51:08 -08:00
shellspeed1
e85379eea2 a 2021-01-24 21:36:04 -08:00
raspy-on-osu
f2d9643c75 init 2021-01-24 22:31:39 -05:00
raspy-on-osu
79640e912d bread in french (who added living bread?) 2021-01-24 19:30:15 -05:00
raspy-on-osu
622a3df378 Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor 2021-01-24 19:21:24 -05:00
Lin
0759189ef5 Merge pull request #14124 from MrJWhit/port-AI-can-now-look-up-and-down-zlevels- 
Port of "AI can now look up and down zlevels"
 2021-01-24 13:30:42 -06:00
Lin
04aaa7aeda Merge pull request #14129 from MrJWhit/cursed-name 
Porting a cursed name about drinking
 2021-01-24 13:24:19 -06:00
Lin
a983b70495 Merge pull request #14121 from MrJWhit/port-Makes-the-microwave-cleanable-by-the-damp-rag- 
Port of "Makes the microwave cleanable by the damp rag"
 2021-01-24 13:23:12 -06:00
Lin
724450822f Merge pull request #14123 from MrJWhit/port-of-Let-Me-Tell-You-A-Story- 
Port "Let Me Tell You A Story"
 2021-01-24 13:20:03 -06:00
Lin
aa8640431c Merge pull request #14126 from MrJWhit/porting-Humanizing-a-monkey-no-longer-yeets-any-buried-smuggler's-satchels-from-the-tile-onto-their-person.- 
Port "Humanizing a monkey no longer yeets any buried smuggler's satchels from the tile onto their person."
 2021-01-24 13:19:42 -06:00
Artur
91cd7378ca Give Improved 2021-01-24 16:05:42 +02:00
silicons
bc49224241 Update species.dm 2021-01-22 20:51:24 -07:00
MrJWhit
6dd674dae4 Porting 2021-01-22 20:47:45 -05:00
Hatterhat
09d91643ef tg 56348 2021-01-22 18:39:46 -06:00
MrJWhit
a78b6ae958 Update transform_procs.dm 2021-01-22 19:35:17 -05:00
MrJWhit
8603a9fc77 Update ai.dm 2021-01-22 19:26:42 -05:00
MrJWhit
01d6d40d8e Port'n 2021-01-22 19:04:37 -05:00
MrJWhit
399d04654a Update alien.dm 2021-01-22 18:57:31 -05:00