Commit Graph

3031 Commits

Author SHA1 Message Date
Timothy Teakettle
8b2a92994f less rng reliance 2020-07-25 20:14:41 +01:00
timothyteakettle
b708be60e9 hey look ma i removed a space 2020-07-25 02:12:21 +01:00
timothyteakettle
2a3f45f7af fixes 2020-07-25 01:10:12 +01:00
timothyteakettle
3ca098fe98 bugfixes 2020-07-25 00:22:24 +01:00
timothyteakettle
315e7e1f99 bugfixes 2020-07-24 23:49:15 +01:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
silicons
d946998fb9 Merge pull request #12857 from timothyteakettle/let-bots-wear-hats
adds deep beepsky lore to the game in the form of hats
2020-07-23 16:18:17 -07:00
silicons
03f0d76a8e yeah ok 2020-07-23 13:23:45 -07:00
Lin
cdd509479e Merge pull request #12868 from Citadel-Station-13/silicons-patch-46
regarding manifest injections
2020-07-23 13:18:35 -05:00
Timothy Teakettle
b18356c95d requested changes 2020-07-23 18:47:34 +01:00
silicons
ce87d3e8c5 Merge pull request #12856 from zeroisthebiggay/radiationsuitsareugly
ports tg radiation suits and also makes syndiekrav gloves actually visually distinct
2020-07-23 10:28:44 -07:00
silicons
9222933d77 Merge pull request #12816 from timothyteakettle/wound-port
ports part 1 of tg wounds
2020-07-23 10:25:25 -07:00
Timothy Teakettle
f5ac0b5762 some fixes 2020-07-23 18:10:46 +01:00
silicons
66e4d98141 Update datacore.dm 2020-07-22 16:59:51 -07:00
timothyteakettle
ed1e8c4221 support for masks 2020-07-22 15:43:58 +01:00
zerothebigboy
7870d90de3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radiationsuitsareugly
# Conflicts:
#	icons/mob/clothing/hands.dmi
#	icons/mob/clothing/head.dmi
#	icons/obj/clothing/gloves.dmi
#	icons/obj/clothing/hats.dmi
2020-07-22 01:03:55 -04:00
timothyteakettle
6891bff9d3 further emotes 2020-07-22 00:07:15 +01:00
timothyteakettle
3a520bba3f more hats 2020-07-21 23:45:04 +01:00
Timothy Teakettle
5c88253f93 lots more hats 2020-07-21 22:58:13 +01:00
zerothebigboy
75c87077ec a 2020-07-21 17:22:35 -04:00
Timothy Teakettle
aea268548c some fixes 2020-07-21 19:54:42 +01:00
DeltaFire
73925501ae I will now proceed to scream internally
Tabby boi bad
2020-07-21 20:13:30 +02:00
Timothy Teakettle
0942b46796 more fashions 2020-07-21 18:43:58 +01:00
timothyteakettle
8e2c76db7c two more 2020-07-21 16:42:59 +01:00
timothyteakettle
99a2068dd2 its cool and hip 2020-07-21 16:26:51 +01:00
timothyteakettle
4daf71d99e woo it works 2020-07-21 03:34:50 +01:00
timothyteakettle
3e0403a7e9 BEEPSKY FASHION 2020-07-21 02:22:42 +01:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
silicons
a7144d2404 Merge pull request #12829 from timothyteakettle/fried-component
the fried component
2020-07-20 16:59:36 -07:00
silicons
448706d540 Merge pull request #12749 from TheSpaghetti/patch-2
Adds monophobia quirk.
2020-07-20 16:54:25 -07:00
Timothy Teakettle
b06948bed4 fry smite 2020-07-20 17:48:37 +01:00
Timothy Teakettle
a0c166c490 badmin safeguarding 2020-07-20 17:43:58 +01:00
Timothy Teakettle
c68f0559d9 old instant eating speed 2020-07-20 17:29:09 +01:00
timothyteakettle
e2b68797b7 bugfixes 2020-07-20 00:49:00 +01:00
timothyteakettle
8709a72fc0 fry everything 2020-07-20 00:40:18 +01:00
Timothy Teakettle
037cec508e fixes a math mistake 2020-07-19 21:43:17 +01:00
TheSpaghetti
16957d78e9 Makes the grammar bad again.
For some reason the fixed grammar didn't compile.
2020-07-18 18:11:48 -04:00
Timothy Teakettle
1a5008fee7 Merge branch 'master' into wound-port 2020-07-18 23:06:49 +01:00
Lin
ba3dc6a73b Merge pull request #12679 from silicons/unarmed_parry
Ok ok hear me out: Implements unarmed parry.
2020-07-18 17:02:02 -05:00
Timothy Teakettle
50b346355c fixes travis but without dm fucking up 2020-07-18 22:13:15 +01:00
Timothy Teakettle
35b5c019a5 Revert "travis please"
This reverts commit b712538e69.
2020-07-18 22:12:01 +01:00
Timothy Teakettle
b712538e69 travis please 2020-07-18 22:10:08 +01:00
Timothy Teakettle
c1ac3bae6e appease travis 2020-07-18 22:06:07 +01:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
Timothy Teakettle
fe79c53f04 bugfixes 2020-07-18 21:40:19 +01:00
Putnam
d88ade40bf actually fixes uplink 2020-07-18 01:51:59 -07:00
timothyteakettle
e8fade4f7f changes 2020-07-18 02:29:12 +01:00
timothyteakettle
7714fcfaba more changes 2020-07-18 01:26:38 +01:00
silicons
183a929e42 Merge pull request #12775 from timothyteakettle/wrestling-rotation-fix
wrestling rotation fix
2020-07-17 17:07:06 -07:00
TheSpaghetti
b2e9579217 Fixes typos in the light sensitivity trait.
It was bothering me.
2020-07-17 00:48:45 -04:00