6dc6159f4a
Merge pull request #9578 from deathride58/mapsubsystemimprovements
...
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
2019-10-29 21:42:32 -07:00
dc0fa95bd9
missed a spot
2019-10-27 16:29:33 -07:00
e55da2f958
BYOND 513
2019-10-27 16:28:21 -07:00
4c8d7023c5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258
2019-10-24 09:50:20 +02:00
fc1f10c97f
Porting components updates and fixing phantom thief component.
2019-10-23 13:01:31 +02:00
68813b6846
Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer
2019-10-22 19:14:12 -04:00
6fc750dca0
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-21 19:13:19 -05:00
50c27df28f
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
2019-10-15 03:48:44 -04:00
bcb11a471d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-13 19:14:16 -05:00
48e4187cef
Merge pull request #9461 from r4d6/master
...
Adding Decorative Wings
2019-10-13 14:00:07 -07:00
0c8b82168d
Merge branch 'master' into Ghommie-cit222
2019-10-12 11:20:32 -04:00
394c947d14
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-11 23:10:45 -05:00
8b1e140fa0
Update code/__HELPERS/mobs.dm
...
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com >
2019-10-10 21:09:14 -04:00
618f8f30c5
Update code/__HELPERS/global_lists.dm
...
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com >
2019-10-10 21:09:09 -04:00
2822f43720
Update global_lists.dm
2019-10-10 20:32:25 -04:00
05fa19c856
Update mobs.dm
2019-10-10 20:32:24 -04:00
735755019e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-10-09 01:18:30 +02:00
3113074bfb
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-08 02:55:32 -05:00
3d404b6967
Merge pull request #9287 from Thalpy/Wiki
...
Adds a markdown parse of all chems for use with github wiki to debug menu.
2019-10-08 00:30:00 -07:00
dcb37bfd0e
Merge pull request #9418 from Ghommie/Ghommie-cit216
...
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
2019-10-07 23:36:11 -07:00
fce6f13471
Ports "Chat Subsystem ported from TerraGov-Marine-Corps"
2019-10-07 23:58:15 +02:00
cac4157894
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-10-05 22:03:37 +02:00
3d22f4ec60
Porting a load of disease/symptoms code updates.
2019-10-05 07:14:25 +02:00
89f3a01bc0
Merge branch 'master' into tg-Organ-port
2019-10-01 06:17:58 +01:00
117e5a409d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-01 00:05:44 -05:00
37a1e39744
Merge branch 'master' into Wiki
2019-09-21 01:29:45 +01:00
8b477a8bcf
Edits output to be a .md and now you can open it in game!! Magic!
2019-09-20 23:30:51 +01:00
277f031143
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147
2019-09-20 02:27:39 +02:00
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
fa7bf43ce7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-16 17:44:10 -05:00
6668630649
Merge branch 'master' into are-those-horns-are-are-you-just-retarded
2019-09-15 23:25:22 -05:00
c813555697
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-09-15 04:05:14 +02:00
bf3d30c0e4
Seperates Insect fluff from wings
...
Fluff can be the new body markings I guess.
2019-09-14 04:27:38 -05:00
f0afc9c490
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-09-13 12:59:15 -05:00
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -05:00
9376bfb44d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded
2019-09-13 12:56:57 -05:00
9561819fb7
Fixes Horn coloration issues, allows mammals to choose their meat type
...
Because reasons I guess.
2019-09-13 10:58:04 -05:00
7e7527dcfe
Merge pull request #9086 from Sishen1542/DYNAMIC-ENTRY
...
Ports dynamic gamemode from /vg/ + also normalizes head/antag restrictions
2019-09-12 18:37:56 +12:00
94afbbd560
Adding Horn colors, multiple-select legs, and species squash
...
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking. Sprites tweaked on a bunch of critters. Added new wings....
2019-09-11 17:46:17 -05:00
8988d1e506
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-09-11 02:41:36 -05:00
9ec97579bd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147
2019-09-03 21:08:09 +02:00
c641874aab
Update unsorted.dm
2019-08-29 20:50:36 -04:00
bd49187ea7
on second thought, let's not try to half ass fancy ideas.
2019-08-26 14:45:36 -05:00
9558252b93
Revert/replaces a lot of #8024 with bleed_rate
...
Wearing armor reduces the blood loss you incur, no longer are you instantly deleted on blood. Dripping blood WILL kill you if you don't solve that issue, medical gauze has been tripled as a QoL for medical staff as a result.
2019-08-26 14:22:17 -05:00
5d1cac62da
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-08-24 13:50:22 +02:00
fb2971e3e6
Merge remote-tracking branch 'origin/master' into donator_grouping
2019-08-15 14:40:44 -07:00
0290a46ddc
Impliments Ghom review, reverts blood list back to component
2019-08-15 12:32:44 -05:00
2073921f4b
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-15 08:39:41 -05:00
b671384015
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-15 08:23:48 -05:00
kevinz000