Commit Graph
33578 Commits
Author SHA1 Message Date
GhomandGitHub c97f86ae5a Update mob_movement.dm 2020-05-06 23:36:40 +02:00
GhomandGitHub 94d67ab640 Update mob_movement.dm 2020-05-06 01:15:30 +02:00
Ghommie e9ccc3ac62 Test and update. 2020-05-06 01:03:54 +02:00
Ghommie 76e1ee80b7 Porting "Mobs now turn towards and are shifted based on grab state towards something pulling them" 2020-05-03 07:12:41 +02:00
Putnam3145andGitHub c1d1e4f0c0 Properly closes some bold tags. (#12088)
* Fixes some unmatched <b>s

* remember to ctrl+s
2020-05-02 14:53:17 +02:00
DeltaFire15andGitHub 21c9c98412 > & < agony (#12082)
hm yes today a check being the wrong way will break exo nanites.
2020-05-02 00:36:03 +02:00
kevinz000andGitHub d678970872 Merge pull request #12068 from zeroisthebiggay/fuckshitasstits
quick hosion mode buff
2020-05-01 14:52:50 -07:00
kevinz000andGitHub ea831677a1 Merge pull request #11961 from Ghommie/Ghommie-cit697
toylathe copypasta removal and preparations for economy public lathe nerf.
2020-05-01 14:52:29 -07:00
Ghommie 54e76e8ffb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-05-01 21:49:52 +02:00
MrJWhitandGitHub 6b4747d5fe Meta station atmos opening up (#12047)
* Spawning area fix.

Part one of many

* Finishing up atmos

* Haha final fixes

* Security camera update

* Haha whoops, thanks lilly
2020-05-01 21:26:36 +02:00
kevinz000andGitHub f99d904dc7 ports /tg/station vis_flags related fixes (#12064)
* fixes

* Update layers_planes.dm

* kay
2020-05-01 21:14:04 +02:00
kevinz000andGitHub 44f9773ccf Merge pull request #12077 from Ghommie/Ghommie-cit714
Stops organs from turning against owners in cold environments and freezers.
2020-05-01 11:50:29 -07:00
MrJWhitandGitHub 5bdafb78c1 Minor updates to pubby for fixing (#12059)
* updates to pubby

* Dear justin, double check something BEFORE publishing it
2020-05-01 18:56:40 +02:00
3fc4416680 Buffs medbots massively. (#12058)
* Buffs medbots massively.

* Reverted the previous buff slightly.

* Update code/modules/mob/living/simple_animal/bot/medbot.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-01 18:50:22 +02:00
Psody-MordheimandGitHub 030201e5de Two lines (#12071) 2020-05-01 18:42:01 +02:00
kevinz000andGitHub 269db0c7d6 Identification components + chameleon clothing from uplink is now obfuscated (#12045)
* fine we'll use components

* syndie kits

* Whew

* examine

* flags

* whew

* compile

* fix

* fix

* ok

* ok

* ok

* done
2020-05-01 18:39:45 +02:00
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
MrJWhitandGitHub 61f6631486 Update engine_sm.dmm (#12062) 2020-05-01 18:26:50 +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
kevinz000andGitHub 2f236ffc04 Merge pull request #12048 from zeroisthebiggay/ilowkeydespiseatmospherics
deautismosifies box station atmospherics
2020-04-30 15:00:36 -07:00
ZeroMan 438a83b5c0 a 2020-04-30 17:56:07 -04:00
kevinz000andGitHub d2b7c35ec7 Merge pull request #12057 from MrJWhit/fixes-up-singulo-room
Links up the rad shutters in singulo engine
2020-04-30 11:13:51 -07: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
GhomandGitHub 373cafd60b Merge pull request #12063 from Citadel-Station-13/kevinz000-patch-6
Disables hardmode citadel combat
2020-04-30 18:20:17 +02:00
kevinz000andGitHub e6e2277634 Update damage_procs.dm 2020-04-30 01:07:40 -07:00
kevinz000andGitHub 9d753fe74f Update damage_procs.dm 2020-04-30 01:07:10 -07:00
kevinz000andGitHub a90a246076 Merge pull request #12024 from NopemanMcHalt/digi-justice_trek
Fixes missing digitigrade sprite for ENT-era command uniform
2020-04-29 12:03:43 -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 619609f5ff Merge pull request #12020 from bunny232/master
Box pool/bar holopads+ scrubbers (that lead to space) in xenobio pens
2020-04-29 12:01:11 -07:00
kevinz000andGitHub 18a8f9c607 Merge pull request #12043 from Owai-Seek/sprite-tweaks-4-27-20
Sprite Updates / Dupe Cleanup
2020-04-29 12:00:38 -07:00
kevinz000andGitHub 57ab38185f Merge pull request #12014 from Trilbyspaceclone/patch-358
Buffs shoulder holsters
2020-04-29 12:00:03 -07:00
kevinz000andGitHub 1d12aa5779 Merge pull request #12006 from Trilbyspaceclone/kiloton-of-errors
Kilo station improvements
2020-04-29 11:59:26 -07:00
MrJWhit 7831b53932 Links up the rad shutters 2020-04-29 14:03:17 -04:00
Anonymous c1f045c98a Merge remote-tracking branch 'upstream/master' into digi-justice_trek 2020-04-29 13:54:50 +03:00
deathride58andGitHub b63cccc38d Merge pull request #12053 from Putnam3145/fix_appendix
Fix appendices instakilling everyone
2020-04-29 01:27:06 -04: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