shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,567 Commits 5 Branches 0 Tags
54e76e8ffb9bc53c424d1d75112213d24ef7ea0f
Commit Graph

4454 Commits

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

* DNR/observer only
 2020-05-01 18:02:00 +02:00
Ghommie
3715f95650 Stops organs from turning against you in cold environments and freezers. 2020-05-01 16:56:33 +02: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
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
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
kevinz000
464fcd02cd Merge remote-tracking branch 'citadel/master' into skills 2020-04-25 22:18:08 -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
d7f38faab9 Merge pull request #11971 from Putnam3145/fix-story-storyteller 
More dynamic tweaks
 2020-04-25 17:05: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
kevinz000
0dc259a985 Merge pull request #11990 from Trilbyspaceclone/patch-357 
Test merge maybe - Buffs space vines
 2020-04-25 16:54:47 -07:00
kevinz000
da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705 
code for designs' security level requirements.
 2020-04-25 16:53:48 -07:00
kevinz000
4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700 
Movespeed modifiers refactor port.
 2020-04-25 16:51:14 -07:00
Ghommie
8440b48a9a organ/on_life tweaks. 2020-04-25 16:19:43 +02:00
kevinz000
e6b0fb4929 this was a mistake 2020-04-25 01:02:47 -07:00
Ghom
5ccdc55e42 Merge pull request #11979 from kevinz000/magnetic_harness 
Cybernetic arm implant balance pass (namely: shields)
 2020-04-25 02:47:28 +02:00
Putnam
95d1a25df7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into fix-story-storyteller 2020-04-24 16:07:38 -07:00
Ghommie
e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Trilbyspaceclone
83ba5c1b9b Update venus_human_trap.dm 2020-04-23 16:52:24 -04:00
kevinz000
1e515b89f9 Update mob_movement.dm 2020-04-23 11:33:10 -07:00
Ghommie
b5abfd9273 thank you dreamchecker. 2020-04-23 14:49:05 +02:00
TrilbySpaceClone
7761990919 soooo this complies but does it work? 2020-04-23 03:13:07 -04:00
TrilbySpaceClone
86abfefa1b still dosnt work 2020-04-23 02:52:07 -04:00
kevinz000
b398e65416 Update mob_movement.dm 2020-04-22 22:46:42 -07:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Lin
7f271157c3 Merge pull request #11929 from Ghommie/Ghommie-cit692 
Shielded Component
 2020-04-22 20:33:12 +00:00
Ghommie
63f5e101a2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit700 2020-04-22 22:30:10 +02:00
Ghommie
63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +02:00
kevinz000
c551006295 catch dropped 2020-04-22 10:54:42 -07:00
Lin
df4452468a Merge pull request #11932 from Ghommie/Ghommie-cit695 
Some mispelled filepaths.
 2020-04-22 16:09:33 +00:00
kevinz000
5c17902628 compile 2020-04-22 08:50:51 -07:00
kevinz000
5984fa02b8 more changes 2020-04-22 08:49:21 -07:00
kevinz000
d259519bff changes 2020-04-22 08:31:09 -07:00
kevinz000
0eac988f52 okay! 2020-04-22 08:22:52 -07:00
Putnam
44925da1d8 Various dynamic tweaks 2020-04-21 20:52:33 -07:00
Ghom
1a9bcddc61 Merge pull request #11938 from Owai-Seek/crab-meat-4-19-2020 
Ups Crab Meat from 1 to 4
 2020-04-22 03:31:19 +02:00
Ghom
5a6a205b9d Merge pull request #11868 from Arturlang/tackling_and_lunge 
Ports TG Tackling and uses it to rework bloodsucker lunge
 2020-04-21 15:50:44 +02:00
Ghom
c7780bde9e Merge pull request #11865 from Citadel-Station-13/kevinz000-patch-5 
Shuffles resist embed higher up on the resist chain
 2020-04-20 22:34:03 +02:00
kevinz000
a984fc5e3d Update living.dm 2020-04-20 11:45:22 -07:00
kevinz000
096a182a84 Update living.dm 2020-04-20 11:44:59 -07:00
kevinz000
ae27bf90e4 Merge pull request #11846 from Putnam3145/vore-optimization 
Optimizing vore + commenting out simplemob vore (sorry)
 2020-04-19 16:45:44 -07:00
Winter Flare
dc5c8fb657 Ups Crab Meat from 1 to 4 2020-04-19 17:00:48 -04:00