Commit Graph

3165 Commits

Author SHA1 Message Date
YakumoChen
55e7645773 updating branch 2019-10-11 04:55:57 -04:00
JTGSZ
988a943f01 Try number 2 2019-10-11 02:36:10 -04:00
r4d6
1b08c541e2 Update wings.dm 2019-10-10 21:11:48 -04:00
r4d6
6b2a68f77a Update code/modules/mob/living/carbon/human/species_types/furrypeople.dm
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
2019-10-10 21:09:28 -04:00
r4d6
e85e499504 I forgot a part.
Copy-pasted the Angel's wings' bit of code to have something to show.
2019-10-10 20:45:38 -04:00
r4d6
2d84b541cf Update wings.dm 2019-10-10 20:32:15 -04:00
r4d6
0d5770f986 Update species.dm 2019-10-10 20:32:12 -04:00
r4d6
e83460853c Update furrypeople.dm 2019-10-10 20:32:09 -04:00
kevinz000
3e6415d4b5 Merge pull request #9324 from Linzolle/crusher
Ports "Adds toggleable light and blinking charging light to crusher" and "Lets the kinetic crusher be one-hand carried"
2019-10-10 02:23:15 -07:00
kevinz000
c4f8956985 Merge pull request #9433 from Poojawa/hoss-tails
Corrects a missing tail state
2019-10-10 02:10:31 -07:00
kevinz000
f686ea75d3 Merge pull request #8615 from Ghommie/Ghommie-cit45
Virtual reality componentization.
2019-10-10 02:09:51 -07:00
kevinz000
0c9a065096 Merge pull request #8401 from Ghommie/Ghommie-cit11
Refactoring Implants' loc n°3
2019-10-10 02:09:37 -07:00
Ghommie
2ac24b2ac6 Fixing head rev blebs 2019-10-09 18:18:49 +02:00
Fermi
c4ac815598 Oof 2019-10-09 16:35:20 +01:00
Fermi
b34f648e60 Adds landmarks. 2019-10-09 13:57:19 +01:00
Ghommie
ac0b3629f1 roundstart quitters 2019-10-09 07:53:59 +02:00
Ghommie
b4e975ef75 mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes. 2019-10-09 06:51:07 +02:00
Ghommie
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
Ghommie
9c3e532be7 Fixes lack of arguments on mobs' can_equip. 2019-10-09 00:21:55 +02:00
JTGSZ
2cd7f8f8ce More control over species based offsets 2019-10-08 17:03:51 -04:00
Poojawa
cbefe95ade Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into hoss-tails 2019-10-08 13:50:29 -05:00
YakumoChen
6faa0ee6e9 reverts jetpack efficiency 2019-10-08 09:03:12 +00:00
Poojawa
d7ab97dffc does some of the television's demands 2019-10-08 04:02:20 -05:00
lolman360
04521551f0 one commit wonder 2019-10-08 19:46:28 +11:00
Poojawa
3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
kevinz000
abef83f56e Merge pull request #9427 from Ghommie/Ghommie-cit219
Skeleton and zombie tweaks/balance (featuring "makes halloween skeletons not the overpowered pirate ones")
2019-10-08 00:34:33 -07:00
kevinz000
8aacedaefa Merge pull request #9316 from Thalpy/Reagents_bitflats
[READY] [FermiChem] Turns reaction vars into bitflags and adds a few new procs related to that.
2019-10-08 00:33:21 -07:00
kevinz000
06e312b208 Merge pull request #9032 from Ghommie/Ghommie-cit178
Ports plasmaman departmental envirosuits and tweaks.
2019-10-08 00:28:06 -07:00
kevinz000
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
Thalpy
564c1fde9f Merge branch 'master' into Reagents_bitflats 2019-10-08 07:31:03 +01:00
kevinz000
0073d99a22 Merge pull request #9309 from Thalpy/tg-Organ-port
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
2019-10-07 23:29:19 -07:00
nik707
6803338df2 Merge pull request #9384 from jakeramsay007/Moar-Bugfixes
Fixes the Trek uniform/suit sprites
2019-10-07 18:19:59 -05:00
Linzolle
4bdd38b422 i feel like this is a really stupid way to fix it 2019-10-07 16:17:42 -05:00
Ghommie
99e9280eaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit178 2019-10-07 21:41:04 +02:00
Poojawa
93ad7f1066 Corrects a missing tail state 2019-10-07 04:30:23 -05:00
Ghommie
7dfd6005d9 I hate nerfing things :( 2019-10-06 19:24:31 +02:00
Ghommie
a1a3bbe99f Skeleton tweaks (featuring "makes halloween skeletons not the overpowered pirate ones") 2019-10-06 19:16:13 +02:00
Fermi
ea031d6d40 Slowly getting there 2019-10-06 11:09:54 +01:00
Poojawa
ee5155bdbb fixes oddities 2019-10-06 04:27:46 -05:00
Thalpy
27c2c89766 Merge branch 'master' into Reagents_bitflats 2019-10-05 23:43:19 +01:00
Ghommie
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
Ghommie
32a73b24c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-10-05 18:22:43 +02:00
Ghommie
3d22f4ec60 Porting a load of disease/symptoms code updates. 2019-10-05 07:14:25 +02:00
Fermi
79e85e2cfa Fixes some runtimes 2019-10-04 03:53:02 +01:00
deathride58
2058cbd09f Merge pull request #9390 from Ghommie/Ghommie_cit212
Ensuring altdisarm() works as intended.
2019-10-03 20:16:05 -04:00
deathride58
6e9a2553af Merge pull request #9393 from jakeramsay007/Even-More-Bugfixes
Fixes AIs being unable to talk through holopads
2019-10-03 20:12:59 -04:00
Poojawa
b589565398 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-03 15:05:26 -05:00
Ghommie
a65b4d0b1c hopefully a performance improvement to stop genitalia from having to update everytime. 2019-10-03 19:08:11 +02:00
Ghommie
8a36c007cd unatomized sin. 2019-10-03 04:38:36 +02:00
Chayse Ramsay
8cbd7d6c06 Fixes AIs being unable to talk through holopads 2019-10-02 21:14:11 +01:00