Commit Graph

19184 Commits

Author SHA1 Message Date
keronshb
68b65c3f93 Fixes some error, re adds knockdown
should prevent item drops
2021-01-30 16:19:09 -05:00
keronshb
8a75d59db2 Meathook tweaks
Changes some values to make it a bit more fair.
2021-01-30 15:59:59 -05:00
shellspeed1
78651f00e3 Update uplink_stealth.dm 2021-01-30 01:27:22 -08:00
SmArtKar
98e75f4f29 Fixes nuclear and KA guns in IC 2021-01-30 12:13:06 +03:00
silicons
5037216f5a Update eyes.dm 2021-01-29 22:16:14 -07:00
Hatterhat
4525b1b64f ooOOooOO today i wont test my code again 2021-01-29 20:19:58 -06:00
silicons
c554f0567e Update human.dm 2021-01-29 11:57:28 -07:00
keronshb
ae970d5b22 Merge remote-tracking branch 'origin/master' into motivation 2021-01-29 13:38:11 -05:00
keronshb
26dfff87fc Slight stat buffs, adds parries and comments
Should be pretty close to 20tc worthy.
2021-01-29 13:17:46 -05:00
keronshb
4346cb937a Fixes merge conflict and makes minor adjustments
TItle
2021-01-29 09:32:28 -05:00
keronshb
a4e933185e Merge remote-tracking branch 'origin/master' into motivation 2021-01-29 09:29:55 -05: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
keronshb
5761417e5b Adding it to traitors
Here it is!
2021-01-28 22:21:20 -05:00
keronshb
a6725b3c23 Motivation near final
Should be almost done after this.
2021-01-28 22:06:25 -05: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
raspy-on-osu
8077d72edd more efficient 2021-01-28 18:47:02 -05:00
raspy-on-osu
fe499636c3 init 2021-01-28 18:42:45 -05:00
zerothebigboy
0bc3c5292c arooga 2021-01-28 12:31:23 -05:00
SmArtKar
a7bc066891 Auto-Observe! 2021-01-28 17:09:28 +03: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
fa2754c0fe Update human.dm 2021-01-27 20:49:56 -07:00
silicons
1c99225fbd Update human.dm 2021-01-27 20:48:07 -07: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
keronshb
a2833ea85f Movitation WIP
WIP still working on this
2021-01-26 13:27:06 -05: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
Dan-Neposh
ff902ee854 removes the cogscarab summon scripture I don't remember adding 2021-01-26 11:57:19 -05:00
Dan-Neposh
caa3d0a90d fixes a punctuation error in the guardian summon description 2021-01-26 11:26:19 -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