Commit Graph

26846 Commits

Author SHA1 Message Date
Letter N
8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
Letter N
834e4730b3 not existing 2021-02-09 15:44:49 +08:00
Letter N
f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
silicons
7c535fb503 Merge pull request #14149 from timothyteakettle/caw-and-gekker
adds 'clucks', 'caws' and 'gekkers' to the speech verb list
2021-01-29 07:30:13 -07:00
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
1974f2b41d Merge pull request #14148 from zeroisthebiggay/whytho
gives the advanced extinguisher a sprite that doesn't look like total dogshit even by codersprite standards
2021-01-29 07:29:28 -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
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
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
Timothy Teakettle
e130e9c7e2 Update flavor_misc.dm 2021-01-28 02:08:19 +00: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
zerothebigboy
e7d8021b81 a 2021-01-27 18:46:11 -05:00
Lin
b1b5adb90d Merge pull request #14086 from Citadel-Station-13/silicons-patch-25
officially adds the functionality to insert holdable mobs into colormate
2021-01-27 17:18:29 -06: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
Lin
4e3a4a30c3 Merge pull request #14139 from Citadel-Station-13/silicons-patch-2
small refactor to pinpointers, allow pinpointers with custom targets
2021-01-27 17:16:09 -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
2765aed0b4 Merge pull request #14085 from Citadel-Station-13/silicons-patch-24
ok as funny as this is, painting pets in gear painters is the result of a potentially awful bug regarding mob holder drop logic
2021-01-26 22:24:57 -08: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
0a5ad34fd6 Update pinpointer.dm 2021-01-26 07:26:59 -07:00
silicons
93ff29a579 Update pinpointer.dm 2021-01-26 00:00:39 -07: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
b77cc68e8d Merge pull request #14133 from Hatterhat/depcards-nobody-asked-for
department budget cards but not in lockers
2021-01-25 23:02:11 -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
efecc1804b Merge pull request #14114 from Hatterhat/fgs
itt: i dont test my code again - free golem ship GPSes start disabled
2021-01-25 22:59:09 -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