Commit Graph

16247 Commits

Author SHA1 Message Date
BlackMajor d0a3b86d7b Fix wormholes event flinging people into asteroids. (#11946)
* Update wormholes.dm

* Update code/modules/events/wormholes.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/events/wormholes.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-01 18:27:39 +02:00
Putnam3145 0019b5a742 Game info verb for ghosts (#11935)
* Some ghost QoL stuff

* DNR/observer only
2020-05-01 18:02:00 +02:00
Arturlang 16b172c178 Fixes and tweaks for bloodsuckers (#12055)
* Tweaaakkksss

* Tweaks and stuff

* Compile
2020-05-01 18:00:15 +02:00
Arturlang 53395171e1 Fixes vendors some (#12056) 2020-05-01 17:59:04 +02:00
kevinz000 2335fd3ca6 kay (#12060) 2020-05-01 17:57:53 +02:00
Ghommie 3715f95650 Stops organs from turning against you in cold environments and freezers. 2020-05-01 16:56:33 +02:00
Sishen 37d1c469ea hnmhm cultplain?? 2020-05-01 06:59:54 -06:00
Psody 42762c459e Lets actually use all the positions 2020-05-01 04:14:34 -04:00
kevinz000 cf8168a17c fixes 2020-04-30 19:26:11 -07:00
ZeroMan 438a83b5c0 a 2020-04-30 17:56:07 -04:00
Lin 7784f5efa1 Merge pull request #12034 from Citadel-Station-13/kevinz000-patch-7
Maybe fixes vehicles blocking projectiles
2020-04-30 17:41:07 +00:00
Lin c4250a41d2 Merge pull request #12017 from kevinz000/skills
Implements a basic skill system + adds surgery skill
2020-04-30 17:39:21 +00:00
kevinz000 aedecc5f0b Merge pull request #12031 from Trilbyspaceclone/cleanbot
Cleanbot
2020-04-30 10:37:37 -07:00
kevinz000 061265981d Merge pull request #12052 from deathride58/fixescheetowalkers
fixes cheetowalkers by making ashwalkers always spawn with a digitigrade leg type of "digitigrade"
2020-04-30 10:37:23 -07:00
kevinz000 9d753fe74f Update damage_procs.dm 2020-04-30 01:07:10 -07:00
kevinz000 d176125c46 Merge pull request #11972 from Trilbyspaceclone/medical-witchcraft
More Useful Gauze MK II
2020-04-29 12:02:51 -07:00
kevinz000 830e1b46c8 Merge pull request #12028 from Putnam3145/fix-story-storyteller
Some more admeme potential for dynamic
2020-04-29 12:02:21 -07:00
kevinz000 f9f573576e Merge pull request #12038 from Trilbyspaceclone/patch-359
Corrects vending tackler gloves
2020-04-29 12:02:00 -07:00
kevinz000 3d116f5e7e Merge pull request #12000 from zeroisthebiggay/comprehensivefucksecuritypr
Fuck Ranged Security Knockdowns: The Taser Nerf PR That Will Get Me Killed By A Witchhunt
2020-04-29 12:01:33 -07:00
Artur 2ec9068cbf Hellish 2020-04-29 09:55:11 +03:00
kevinz000 7d17da1bac stuff 2020-04-28 23:51:49 -07:00
Putnam 2c6ef2f5d1 fix appendices instakilling everyone 2020-04-28 22:14:32 -07:00
deathride58 95c7252d3f fixes cheetowalkers by making ashwalkers always spawn with a digitigrade leg type of "digitigrade" 2020-04-29 00:01:26 -04:00
Lin 19f89ed1ba Merge pull request #12022 from Ghommie/Ghommie-cit711
organ/on_life tweaks.
2020-04-29 01:15:02 +00:00
Lin 50a6128a83 Merge pull request #12032 from Citadel-Station-13/kevinz000-patch-4
Silicons are now immune to default combat knockdown behavior
2020-04-27 16:24:49 +00:00
TrilbySpaceClone 5d6da47db7 Merge branch 'master' into medical-witchcraft 2020-04-27 07:25:18 -04:00
Artur 5d53ead547 Fucky wucky gateway and ccslab 2020-04-27 10:43:08 +03:00
Trilbyspaceclone e33087cbf2 corrects vending tackler gloves 2020-04-26 22:06:35 -04:00
Putnam 51c6387224 now 2020-04-26 13:44:04 -07:00
Ghom 858c697acc Merge pull request #11977 from kevinz000/xenomorph_balancing_pass
Xenomorph balancing pass
2020-04-26 14:03:15 +02:00
Ghom b1befc2ba4 Merge pull request #11989 from Citadel-Station-13/kevinz000-patch-2
Nerfs confusion
2020-04-26 13:50:46 +02:00
Ghom 0cb32c901e Merge pull request #12013 from kappa-sama/patch-23
lowers plasmafist to standard spell costs
2020-04-26 13:45:28 +02:00
kevinz000 2e35a42f43 wow lotsa effort huh 2020-04-26 04:10:38 -07:00
kevinz000 bf7962d8f9 wow lotsa effort huh 2020-04-26 03:36:09 -07:00
kevinz000 1b5e4b32cb wow lotsa effort huh 2020-04-26 03:33:26 -07:00
kevinz000 aeaf6ea102 wow lotsa effort huh 2020-04-26 03:33:08 -07:00
kevinz000 af3651172c wow lotsa effort huh 2020-04-26 03:29:31 -07:00
kevinz000 464fcd02cd Merge remote-tracking branch 'citadel/master' into skills 2020-04-25 22:18:08 -07:00
kevinz000 0e8c2ca109 Update projectile.dm 2020-04-25 21:04:22 -07:00
kevinz000 e54ba579d0 Update silicon_defense.dm 2020-04-25 20:52:27 -07:00
TrilbySpaceClone 1740531432 it just complies 2020-04-25 23:23:42 -04:00
kevinz000 8fc661ba14 Update pins.dm 2020-04-25 17:34:00 -07:00
kevinz000 5e750bd43d Update pins.dm 2020-04-25 17:21:33 -07:00
Putnam 77a378b131 wow that's the wrong thing to do 2020-04-25 17:16:31 -07:00
Putnam b9e88f85bb Allowed better admeme stuff for dynamic 2020-04-25 17:15:17 -07:00
kevinz000 af08e0fecf Merge pull request #11984 from Hatterhat/fastpump
The Neo-Russian Rifleman's Primer - a book that makes you pump shotguns and work rifle bolts faster
2020-04-25 17:07:29 -07:00
kevinz000 24bac60a95 Merge pull request #12012 from Ghommie/Ghommie-cit710
Fixing non-skirt dresses being invisible on digitigrades.
2020-04-25 17:05:49 -07:00
kevinz000 d7f38faab9 Merge pull request #11971 from Putnam3145/fix-story-storyteller
More dynamic tweaks
2020-04-25 17:05:38 -07:00
kevinz000 f6a5f92ff3 Merge pull request #11918 from Ghommie/Ghommie-cit689
nerf to biogenerator upgrades, removal of flour and glass bottles designs.
2020-04-25 16:59:38 -07:00
kevinz000 d9b6ea5181 Merge pull request #11847 from Ghommie/Ghommie-cit679
A peeve with random bodies.
2020-04-25 16:59:07 -07:00