Commit Graph

18777 Commits

Author SHA1 Message Date
Timothy Teakettle 983aac10a2 fixes it properly 2020-06-21 17:39:36 +01:00
Anonymous 9e7b884e86 Adds remaining TOSOrvikepi 2020-06-21 13:25:23 +03:00
Anonymous 384e951b1c Merge branch 'master' into orvilike_bonus 2020-06-21 12:03:28 +03:00
DeltaFire 82d21e4824 smol fix 2020-06-21 03:44:12 +02:00
shellspeed1 06f0d42ee9 makes chem packs slightly cheaper 2020-06-20 16:53:39 -07:00
Lin 905d4ee74d Merge pull request #12558 from Citadel-Station-13/kevinz000-patch-4
Drastically buffs punch hit chance
2020-06-20 18:44:17 -05:00
DeltaFire 6cababd09b yeeah no more free random nullcrates 2020-06-21 01:30:39 +02:00
Detective Google ab05e48149 adds the medical gygax 2020-06-20 16:22:28 -05:00
Anonymous 45dab7fa66 Kepi and Orvilike Kepi 2020-06-20 22:52:33 +03:00
Detective Google 4e26916502 Merge remote-tracking branch 'upstream/master' into bald-bald-bald-bald-bald-bald-bald 2020-06-20 14:00:14 -05:00
Linzolle b873f244c9 finally 2020-06-19 22:46:31 -05:00
kevinz000 354cc7d0c7 Update jellypeople.dm 2020-06-19 19:31:38 -07:00
Ghommie 48c13fcc10 Removing now unused old embed behavior 2020-06-20 00:15:52 +02:00
Ghommie 29a8d2ed78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813 2020-06-20 00:07:47 +02:00
kevinz000 6516e07bd8 Merge pull request #12566 from Ghommie/Ghommie-cit818
Fixing some runtimes issues and warnings bout rnd.
2020-06-19 14:22:40 -07:00
Ghom e31ce2edcf Merge pull request #12414 from LetterN/asset-cache-thing
asset cache + better minimaps
2020-06-19 23:09:09 +02:00
Ghom dd009ada48 Merge pull request #12542 from bunny232/scrubber
Removes lewd events from the vent clog event
2020-06-19 23:07:23 +02:00
Ghommie 43acf79dd3 oh wow 2020-06-19 21:55:01 +02:00
Ghommie 162549a3c2 Fixing stuff. 2020-06-19 20:34:51 +02:00
Ghommie d555394290 Let's just use tgstation's. 2020-06-19 19:01:05 +02:00
Timothy Teakettle 7fa5107b4b all methods of cooking define quality 2020-06-19 17:16:34 +01:00
Timothy Teakettle a8f4988c36 alter form updates hair 2020-06-19 17:09:54 +01:00
Timothy Teakettle 0d197e82f8 Merge branch 'master' into cool-ipcs 2020-06-19 01:57:02 +01:00
Lin 3cdc73ff35 Merge pull request #12487 from kevinz000/erp_2
Adds ||italics|| __underline__ ++bold++ support because why the fuck not
2020-06-18 13:37:10 -05:00
Lin 7d30d7c7ff Merge pull request #12545 from Citadel-Station-13/kevinz000-patch-1
maybe fixes conveyors being a crash vector
2020-06-18 13:34:31 -05:00
nik707 1f53cd34d3 Merge pull request #12563 from kevinz000/shuttles
fixes master (shuttles not loading)
2020-06-18 10:41:20 -05:00
kevinz000 8a90590263 Update species.dm 2020-06-18 08:25:49 -07:00
kevinz000 1b5ea90c8f sigh 2020-06-18 08:16:05 -07:00
shellspeed1 b490f02c78 Ports IV bags from TG
Ports the iv bag portion of https://github.com/tgstation/tgstation/pull/44531/files from tg.
2020-06-18 02:30:58 -07:00
SmArtKar 17c38efbb0 Runtime Fixes 2020-06-18 11:24:08 +03:00
kevinz000 291004d0fb Update species.dm 2020-06-17 22:44:08 -07:00
kevinz000 78fadafa05 alright 2020-06-17 21:44:49 -07:00
kevinz000 409dbd2835 carbons and humans 2020-06-17 21:42:04 -07:00
kevinz000 1336404eb6 last ones 2020-06-17 21:37:19 -07:00
kevinz000 445d94f335 haha whew 2020-06-17 21:32:10 -07:00
kevinz000 118ac1a775 Merge pull request #12548 from timothyteakettle/more-events
ports several tg events including fugitives
2020-06-17 20:10:04 -07:00
kevinz000 c42889feb6 Merge pull request #12555 from Funce/sqrt-circuit-fix
Square Root Circuit fix
2020-06-17 20:08:11 -07:00
Lin 46fdb476b5 Merge pull request #12482 from TheSpaghetti/patch-1
More insectoid insects (I accidentally ruined the first version of this, so I'm trying again.)
2020-06-17 20:03:25 -05:00
Detective Google 0e1db216c8 Ports the reworked snowcabin and beach away missions by Jerry Derpinson (the baldy) 2020-06-17 19:33:14 -05:00
Funce aa798af36e Fix square root circuit to check the only input it has 2020-06-18 08:50:29 +12:00
Timothy Teakettle 2229db2214 Merge branch 'master' into embed-changes 2020-06-17 16:40:34 +01:00
kevinz000 eb572c9d47 Merge pull request #12537 from timothyteakettle/ports-tipping-medibots
ports tipping medbots from tg
2020-06-17 08:35:50 -07:00
kevinz000 2e943e03a3 Merge pull request #12544 from SmArtKar/bee_shuttles
Shuttles from beestation
2020-06-17 08:35:34 -07:00
Artur 92a60d6e68 Makes it actually work 2020-06-17 17:37:03 +03:00
Artur 7055e6c47a Ports https://github.com/tgstation/tgstation/pull/51585 2020-06-17 17:07:42 +03:00
Artur 43951bf44e Ports https://github.com/tgstation/tgstation/pull/51152 2020-06-17 17:01:55 +03:00
Artur bac16dbf61 Trying to fix the examine bug.. 2020-06-17 16:13:10 +03:00
Trilbyspaceclone 4e1817d2be why were these tabs? 2020-06-17 03:22:29 -04:00
Trilbyspaceclone 4d9eeae268 Update necropolis_chests.dm 2020-06-17 03:08:52 -04:00
Trilbyspaceclone 51da7dfa71 Merge branch 'master' into spike-loot-differentces 2020-06-17 02:36:52 -04:00