Commit Graph
22111 Commits
Author SHA1 Message Date
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
Putnam3145andGitHub 0019b5a742 Game info verb for ghosts (#11935)
* Some ghost QoL stuff

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

* Tweaks and stuff

* Compile
2020-05-01 18:00:15 +02:00
ArturlangandGitHub 53395171e1 Fixes vendors some (#12056) 2020-05-01 17:59:04 +02:00
kevinz000andGitHub 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
ZeroMan 438a83b5c0 a 2020-04-30 17:56:07 -04:00
ZeroMan 52b7086876 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ilowkeydespiseatmospherics
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
2020-04-30 13:48:48 -04:00
LinandGitHub 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
LinandGitHub c4250a41d2 Merge pull request #12017 from kevinz000/skills
Implements a basic skill system + adds surgery skill
2020-04-30 17:39:21 +00:00
kevinz000andGitHub aedecc5f0b Merge pull request #12031 from Trilbyspaceclone/cleanbot
Cleanbot
2020-04-30 10:37:37 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 9d753fe74f Update damage_procs.dm 2020-04-30 01:07:10 -07:00
kevinz000andGitHub 1e42f3a3b7 Merge pull request #12023 from Ghommie/Ghommie-cit712
Fixing riding layers for human/cyborgs.
2020-04-29 12:03:29 -07:00
kevinz000andGitHub d176125c46 Merge pull request #11972 from Trilbyspaceclone/medical-witchcraft
More Useful Gauze MK II
2020-04-29 12:02:51 -07:00
kevinz000andGitHub 830e1b46c8 Merge pull request #12028 from Putnam3145/fix-story-storyteller
Some more admeme potential for dynamic
2020-04-29 12:02:21 -07:00
kevinz000andGitHub f9f573576e Merge pull request #12038 from Trilbyspaceclone/patch-359
Corrects vending tackler gloves
2020-04-29 12:02:00 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 57ab38185f Merge pull request #12014 from Trilbyspaceclone/patch-358
Buffs shoulder holsters
2020-04-29 12:00:03 -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
LinandGitHub 19f89ed1ba Merge pull request #12022 from Ghommie/Ghommie-cit711
organ/on_life tweaks.
2020-04-29 01:15:02 +00:00
LinandGitHub 64a5831a28 Merge pull request #12044 from Citadel-Station-13/kevinz000-patch-2
Fixes cybernetics not updating slowdowns when dropping shield
2020-04-29 01:07:55 +00:00
ZeroMan 18eb42315e i missed a src 2020-04-28 02:55:25 -04:00
ZeroMan 8dc130175d i actually despise coding 2020-04-28 02:46:46 -04:00
LinandGitHub 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
LinandGitHub 68bad2ee3f Merge pull request #12033 from Citadel-Station-13/kevinz000-patch-6
fixes shield bashing working while downed
2020-04-27 16:24:29 +00:00
TrilbySpaceClone 1191268430 kevs request 2020-04-27 07:34:23 -04:00
TrilbySpaceClone 5d6da47db7 Merge branch 'master' into medical-witchcraft 2020-04-27 07:25:18 -04:00
kevinz000andGitHub 4e8a8dbebd Update items.dm 2020-04-27 02:55:11 -07:00
TrilbyspacecloneandGitHub e33087cbf2 corrects vending tackler gloves 2020-04-26 22:06:35 -04:00
kevinz000andGitHub 28da033111 fine 2020-04-26 17:37:27 -07:00
Putnam 51c6387224 now 2020-04-26 13:44:04 -07:00
GhomandGitHub 858c697acc Merge pull request #11977 from kevinz000/xenomorph_balancing_pass
Xenomorph balancing pass
2020-04-26 14:03:15 +02:00
GhomandGitHub b1befc2ba4 Merge pull request #11989 from Citadel-Station-13/kevinz000-patch-2
Nerfs confusion
2020-04-26 13:50:46 +02:00
GhomandGitHub 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 f70490c61d fixes 2020-04-26 04:40:18 -07:00
kevinz000 2e35a42f43 wow lotsa effort huh 2020-04-26 04:10:38 -07:00
kevinz000 ff9f18bdbd wow lotsa effort huh 2020-04-26 03:38:41 -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 e3b987879e wow lotsa effort huh 2020-04-26 03:30:18 -07:00
kevinz000 a9d0ce45b9 wow lotsa effort huh 2020-04-26 03:29:43 -07:00
kevinz000 af3651172c wow lotsa effort huh 2020-04-26 03:29:31 -07:00
Putnam 00c2ddce8f Actually this is better 2020-04-25 23:18:37 -07:00
Putnam 3da4701dff Switch roundstart thing to initial. 2020-04-25 23:06:15 -07:00
kevinz000 464fcd02cd Merge remote-tracking branch 'citadel/master' into skills 2020-04-25 22:18:08 -07:00