 Ghommie
|
ea30b2fb1a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616
|
2020-03-15 22:35:59 +01:00 |
|
|
Ghommie
|
5bfbcd0948
|
Fixing some GetElement runtimes.
|
2020-03-15 15:12:35 +01:00 |
|
|
kevinz000
|
2139bfdb5f
|
Merge pull request #11290 from Putnam3145/traitor-types
Traitor classes: a new paradigm.
|
2020-03-15 01:35:30 -07:00 |
|
|
kevinz000
|
395fa32136
|
Merge pull request #11447 from Ghommie/Ghommie-cit618
Porting datum components system updates.
|
2020-03-14 09:09:50 -07:00 |
|
|
Ghommie
|
da5b293033
|
underscores.
|
2020-03-12 21:31:17 +01:00 |
|
|
Ghommie
|
663a849afe
|
Makes the autotransfer subsystem a bit more optional.
|
2020-03-12 21:02:34 +01:00 |
|
|
Ghommie
|
0876a1eef6
|
Porting datum components system updates.
|
2020-03-12 18:22:26 +01:00 |
|
|
Trilbyspaceclone
|
41ed18a537
|
Changes up some lava land ruins spawns (#11422)
* Update lavaland.dm
* Update lavaland.dm
|
2020-03-12 14:25:54 +01:00 |
|
|
Ghom
|
88bdc6d068
|
Merge pull request #11440 from kevinz000/master_fix
fixes master
|
2020-03-12 01:54:15 +01:00 |
|
|
Ghom
|
dbc54ab699
|
Update actions.dm
|
2020-03-12 01:47:51 +01:00 |
|
|
kevinz000
|
fa160d4c3a
|
Merge pull request #11434 from Citadel-Station-13/Ghommie-patch-3
Fixes flavor text preview on the chatbox.
|
2020-03-11 17:44:35 -07:00 |
|
|
kevinz000
|
db188f8681
|
Merge pull request #11307 from kappa-sama/patch-17
gets rid of fly species requirement from hulk
|
2020-03-11 17:43:23 -07:00 |
|
|
kevinz000
|
6127f6a453
|
k
|
2020-03-11 17:41:12 -07:00 |
|
|
kevinz000
|
54713dc1e4
|
Merge pull request #11408 from necromanceranne/sleeping_carp_port
Refactors Martial Arts code, human_defense, and ports New Sleeping Carp
|
2020-03-11 17:26:33 -07:00 |
|
|
kappa-sama
|
80b17cff1f
|
Merge branch 'master' into patch-17
|
2020-03-11 20:26:13 -04:00 |
|
|
kevinz000
|
b8642c5622
|
Merge pull request #11424 from necromanceranne/death_coma_stuff
Some fakedeath fixes requested by kev also ports a fix from tg to regen coma
|
2020-03-11 17:24:03 -07:00 |
|
|
kevinz000
|
69c21f4b76
|
Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
|
2020-03-11 17:01:37 -07:00 |
|
|
Putnam3145
|
480eb32c68
|
Merge pull request #11418 from Ghommie/Ghommie-cit615
Fix runtimes some more.
|
2020-03-11 17:01:13 -07:00 |
|
|
Ghom
|
9f681e9a76
|
Merge pull request #11409 from necromanceranne/taser_nerf
Particle Defender no longer just the HoS taser but a shotgun/Stimulants protect against the tased effect.
|
2020-03-12 00:30:52 +01:00 |
|
|
Ghom
|
77bdb9afe8
|
Update flavor_text.dm
|
2020-03-11 17:15:04 +01:00 |
|
|
Ghommie
|
be3d45d0b9
|
Mistake.
|
2020-03-11 16:54:33 +01:00 |
|
|
Ghommie
|
b371766853
|
Edge cases.
|
2020-03-11 16:53:47 +01:00 |
|
|
Ghommie
|
d31075eb54
|
Spellcasting element
|
2020-03-11 16:23:30 +01:00 |
|
|
necromanceranne
|
c37d30a617
|
Some fixes requested by kev also ports a fix from tg
|
2020-03-11 15:43:47 +11:00 |
|
|
necromanceranne
|
e3f6f07e73
|
some adjustments for now
|
2020-03-11 15:26:21 +11:00 |
|
|
kevinz000
|
46823a127b
|
Merge pull request #11335 from Ghommie/Ghommie-cit604
Made flavor texts into an element datum, appliable to every atom.
|
2020-03-10 17:26:20 -07:00 |
|
|
Ghommie
|
27a7f754c4
|
Fix runtimes some more.
|
2020-03-10 22:40:06 +01:00 |
|
|
Ghom
|
ddc7d5cf12
|
Update flavor_text.dm
|
2020-03-10 17:28:31 +01:00 |
|
|
Ghommie
|
7578d60436
|
flavor texts unset on randomize, yay.
|
2020-03-10 15:11:16 +01:00 |
|
|
Ghommie
|
7ba120a8d3
|
lazyor
|
2020-03-10 14:12:11 +01:00 |
|
|
necromanceranne
|
e0df350579
|
PD now isn't a HoS taser x3 and has reasonable damage, stimulants actually combat the taser effect instead of you just being completely fucked by the HoS even through adrenals.
|
2020-03-10 23:21:59 +11:00 |
|
|
necromanceranne
|
f41f78b162
|
Massively refactors martial arts, ports New Sleeping Carp
|
2020-03-10 20:09:31 +11:00 |
|
|
Ghommie
|
17007182c9
|
Merge branch 'Ghommie-cit604' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit604
|
2020-03-09 22:42:31 +01:00 |
|
|
Ghommie
|
aa8dc93a5d
|
locate textref.
|
2020-03-09 22:27:27 +01:00 |
|
|
Ghommie
|
0587d3482d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit604
|
2020-03-09 21:53:22 +01:00 |
|
|
Seris02
|
067e2e4506
|
probably fixes hulk
|
2020-03-09 18:15:12 +08:00 |
|
|
Seris02
|
cccd0e9eef
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-03-09 16:49:32 +08:00 |
|
|
Seris02
|
9b66940807
|
fixes the web
|
2020-03-09 16:27:46 +08:00 |
|
|
kevinz000
|
d7c5b87263
|
Update action.dm
|
2020-03-08 21:24:52 -07:00 |
|
|
Ghom
|
8878733fc1
|
Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI
Ports Skyrat's synths (Plus limb rendering overhaul and more)
|
2020-03-09 00:26:06 +01:00 |
|
|
Ghom
|
1cd9c19b4c
|
Merge pull request #11288 from Trilbyspaceclone/patch-300
[ready] Craftable Prescription & Sunglasses HUDs
|
2020-03-09 00:01:12 +01:00 |
|
|
Ghom
|
bceed5d002
|
Update recipes_clothing.dm
|
2020-03-08 23:46:33 +01:00 |
|
|
kevinz000
|
c736568a5a
|
Merge pull request #11369 from Ghommie/Ghommie-cit609
Porting the musician and curator beacons.
|
2020-03-08 07:34:48 -07:00 |
|
|
Ghom
|
a139f0adc6
|
Update flavor_text.dm
|
2020-03-08 01:38:42 +01:00 |
|
|
Ghom
|
991f9a75b7
|
Update flavor_text.dm
|
2020-03-08 01:33:02 +01:00 |
|
|
Ghom
|
d10f0b0e2f
|
Update flavor_text.dm
|
2020-03-08 01:28:42 +01:00 |
|
|
Ghom
|
ec0d0f9ada
|
Update flavor_text.dm
|
2020-03-08 01:27:14 +01:00 |
|
|
Ghom
|
213086ae9f
|
Merge pull request #11345 from Citadel-Station-13/kevinz000-patch-12
VV now internally always uses \ref instead of REF()
|
2020-03-07 11:37:17 +01:00 |
|
|
kevinz000
|
02a488f507
|
Merge pull request #11340 from Ghommie/Ghommie-cit605
Porting movespeed modifiers code updates.
|
2020-03-07 03:26:48 -07:00 |
|
|
Putnam
|
71ac07426a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into traitor-types
|
2020-03-06 17:03:24 -08:00 |
|