Commit Graph

4729 Commits

Author SHA1 Message Date
kevinz000 69374c64c9 k 2020-03-16 04:18:22 -07:00
kevinz000 857f793600 ok 2020-03-16 04:12:54 -07:00
kevinz000 644273beca k 2020-03-16 04:09:25 -07:00
kevinz000 94db06509c slight desword reflect meme buff 2020-03-16 03:50:26 -07:00
kevinz000 d32bff7815 return list 2020-03-16 03:35:10 -07:00
kevinz000 09e1be9651 block args 2020-03-16 03:32:12 -07:00
kevinz000 703fca5f90 add owner argument 2020-03-16 03:24:19 -07:00
kevinz000 5d2fb654e8 k 2020-03-16 03:23:09 -07:00
kevinz000 9ead492bb0 changes 2020-03-16 00:28:18 -07:00
BlackMajor 97b8d0ba27 small ash walker camp tweak 2020-03-16 19:51:47 +13:00
Hatterhat 1fe67d5ce9 a finger of the monkey's paw curls. 2020-03-16 01:35:47 -05:00
Ghommie 5e5bdec85d More runtime errors. 2020-03-16 01:55:02 +01:00
Ghommie ea30b2fb1a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616 2020-03-15 22:35:59 +01:00
Hatterhat 802d37a399 borgs should be outclassed lategame and not hunt 2020-03-15 15:55:31 -05:00
Ghom d8a6e9b94f Merge branch 'master' into Ghommie-cit621 2020-03-15 13:07:45 +01:00
kevinz000 195a3b593b Merge pull request #11458 from Trilbyspaceclone/patch-310
Buffs borg hypos - Anti-radiation addition
2020-03-14 22:21:32 -07:00
kevinz000 4d0677daa9 s 2020-03-14 21:48:23 -07:00
kevinz000 2113b63428 o boy 2020-03-14 21:42:23 -07:00
kevinz000 1a061a5d3e agony 2020-03-14 21:14:56 -07:00
kevinz000 e73e1b03ec Revert "Stunbaton disarm mode also works on disarm intent now" (#11446) 2020-03-14 23:14:57 +01:00
kevinz000 d4131912e9 Merge pull request #11452 from Citadel-Station-13/Linzolle-patch-1
make the CMO hypokit not literally worse than normal ones
2020-03-14 09:11:58 -07:00
Seris02 5a04b43db4 duffel baaaaaaaaaaags 2020-03-14 16:12:17 +08:00
Ghommie 1d51ac5ff2 Fixing some bug reports. 2020-03-14 02:34:25 +01:00
Trilbyspaceclone 6993dfde2a Now stocked at your local robotics 2020-03-13 18:29:46 -04:00
Lin 0ca58b5ed8 why though 2020-03-13 04:19:20 +00:00
Trilbyspaceclone a2baa47600 50 commits of hell 2020-03-12 21:27:12 -04:00
Trilbyspaceclone 7b02915cc7 Update sheet_types.dm 2020-03-12 21:24:20 -04:00
Ghommie 0876a1eef6 Porting datum components system updates. 2020-03-12 18:22:26 +01:00
kevinz000 87928d43ea stamcrit check for fireaxe afterattack() (#11426)
* Update twohanded.dm

* Update twohanded.dm
2020-03-12 14:21:47 +01:00
kevinz000 0b6c5b7960 Update twohanded.dm 2020-03-11 18:19:09 -07:00
kevinz000 54713dc1e4 Merge pull request #11408 from necromanceranne/sleeping_carp_port
Refactors Martial Arts code, human_defense, and ports New Sleeping Carp
2020-03-11 17:26:33 -07:00
kevinz000 69c21f4b76 Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
2020-03-11 17:01:37 -07:00
Putnam3145 480eb32c68 Merge pull request #11418 from Ghommie/Ghommie-cit615
Fix runtimes some more.
2020-03-11 17:01:13 -07:00
kevinz000 0d80c8c169 Merge pull request #11412 from Citadel-Station-13/Ghommie-patch-2
RCL inhands wires fix.
2020-03-11 17:01:01 -07:00
Ghommie d31075eb54 Spellcasting element 2020-03-11 16:23:30 +01:00
Ghom 0d7612dcf5 [s] Sanitizes ParseSong tempo. 2020-03-11 00:29:31 +01:00
Ghommie 27a7f754c4 Fix runtimes some more. 2020-03-10 22:40:06 +01:00
Ghommie 2b4b626fac support for items that switch states through update_icon. 2020-03-10 16:55:30 +01:00
Ghom b03af0ea9a Update RCL.dm 2020-03-10 14:44:33 +01:00
kevinz000 832d894e92 Merge pull request #11388 from Owai-Seek/crabby-patty-3/1/20
Food Ports / Butter Bear / Food Craft Speed
2020-03-10 05:59:24 -07:00
kevinz000 e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612
Porting "Further update_icon splitup"
2020-03-10 05:58:17 -07:00
kevinz000 3eac86cf31 Merge pull request #11394 from Citadel-Station-13/Ghommie-patch-3
Actually fixing that one overlay.
2020-03-10 05:57:18 -07:00
kevinz000 bfb75eb26b Merge pull request #11396 from Ghommie/Ghommie-cit613
Ports "Switches out the three billion args of electrocute act for flags"
2020-03-10 05:56:28 -07:00
necromanceranne b03d83926a Forgot the scroll 2020-03-10 20:27:40 +11:00
Ghommie 4143c1963c Porting more legcuffs / bola fixes etcetera 2020-03-09 16:20:51 +01:00
Seris02 cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
Ghommie ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
Ghom f8c18fe5a8 Update PDA.dm 2020-03-09 00:52:11 +01:00
Ghom 1c5aa2f933 Merge pull request #11377 from Kraseo/contractor-fixes
Some contractor adjustments & fixes
2020-03-09 00:26:54 +01:00
Winter Flare bb9066e9cb Food Additions / Butter Bear
Ports the following from TG:
Chicken Nugget Box
Crab Burger, Bisque, French Onion Soup, Crab Rangoo
Butter Bear aka Terrygold

Tweaks Bisque and Crab Rangoo recipie.
Removes Bacon from Exotic Meat crate.
Adds Spider Eggs to Exotic Meat crate.
2020-03-08 14:36:08 -04:00