Commit Graph

3465 Commits

Author SHA1 Message Date
silicons 6c83beea02 Merge pull request #12937 from Ghommie/Ghommie-cit834
Fixing new bugs and stuff.
2020-07-28 10:46:17 -07:00
Hatterhat 8a32cac8db window rotation fix 2020-07-28 10:47:07 -05:00
Sishen 27aba092e0 aaaaaaaaaa 2020-07-27 08:20:03 -06:00
Ghommie f1c242aadc Fixing new bugs and stuff. 2020-07-27 14:16:01 +02:00
Timothy Teakettle 36d6246bc1 it is now harder to deal wounds 2020-07-26 18:54:57 +01:00
SiliconMain 8f1a8adcfd Update negative.dm 2020-07-26 04:15:39 -05:00
silicons 1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
timothyteakettle 3467bf3515 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-07-26 00:25:26 +01:00
silicons 91081ef24c Merge pull request #12872 from Iatots/hairball
Adds depth to the lick wounds mechanic.
2020-07-25 15:40:15 -07:00
Timothy Teakettle 8b2a92994f less rng reliance 2020-07-25 20:14:41 +01:00
silicons 0e1574bf77 sigh 2020-07-24 23:34:47 -07: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
Timothy Teakettle c6de85bae4 yes i too like sec being blind 2020-07-24 15:24:02 +01:00
Letter N 8e177bf01e another batch - MAJOR: teleportaiton, displaycase (ico port needed), 2020-07-24 19:58:48 +08:00
Iatots f53f7c5e92 Update cuts.dm 2020-07-24 07:46:09 +02:00
silicons 1f25c7f06d Merge remote-tracking branch 'citadel/master' into shoelaces 2020-07-23 16:23:34 -07: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
Iatots 554e764be8 Update cuts.dm
dang speededit
2020-07-23 21:00:26 +02:00
Iatots a2381755e1 Update cuts.dm
nomenclature error
2020-07-23 20:52:29 +02:00
Iatots e6dd213a2a Update recipes_misc.dm 2020-07-23 20:26:11 +02: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
Iatots 9d89158fda Update cuts.dm 2020-07-23 19:48:41 +02:00
Timothy Teakettle b18356c95d requested changes 2020-07-23 18:47:34 +01:00
Iatots 3dac7e4b43 Update generic_positive_events.dm 2020-07-23 19:44:02 +02:00
silicons da4e208f94 ok 2020-07-23 10:40:12 -07:00
silicons db24df58a0 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:36:46 -07: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 ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -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 3a38344a04 fix 2020-07-23 00:25:06 -07: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
Letter N d5a6a3ecd9 actual code chang 2020-07-22 12:02:31 +08:00
lolman360 17d1fd0692 fixes 2020-07-22 12:42:46 +10:00
lolman360 f33487e972 complie 2020-07-22 11:36:50 +10:00
lolman360 0f1aa3c0ca 'lolman? did you test your code?'
no i did not ms. kevinz
2020-07-22 10:49:56 +10: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