a7dd74201c
2
2021-02-04 16:51:06 -05:00
8077d72edd
more efficient
2021-01-28 18:47:02 -05:00
fe499636c3
init
2021-01-28 18:42:45 -05:00
622a3df378
Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor
2021-01-24 19:21:24 -05:00
399d04654a
Update alien.dm
2021-01-22 18:57:31 -05:00
ddad368d6a
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-08 00:33:57 -08:00
c8ce23886c
Update code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
...
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
2021-01-02 22:10:36 -08:00
f02a6cf68b
Space
2020-12-31 01:18:30 -08:00
949aab2a4a
extra desc
2020-12-31 01:07:24 -08:00
3462f3d114
Changes some descriptions. Port of https://github.com/BeeStation/BeeStation-Hornet/pull/3144
2020-12-31 00:43:05 -08:00
0e652cb64c
init
2020-12-26 06:02:09 -05:00
a808f805d4
ASYNC EVERYTHING!
2020-12-21 16:24:51 +08:00
f8d43b7544
Merge pull request #13679 from DeltaFire15/system-corruption
...
[TESTMERGE ONLY] System Corruption for robotic species
2020-11-18 22:54:51 -07:00
922129abd2
proc override stuff
2020-11-15 21:12:01 +01:00
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
641970f2c0
fixes two typos
...
yeah, I got those two wrong. Not anymore though.
2020-10-10 16:48:25 +02:00
4146566af0
hoo boy
...
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
2020-10-06 17:34:13 +02:00
435565f1d8
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
2020-09-21 00:16:12 +03:00
12b879c777
oh yeah xenos had handle_changeling (??)
2020-09-07 03:28:39 -07:00
3bef4ba35e
TGUI updates + statpanel
2020-09-02 17:52:47 +03:00
b3c459c59c
okay you can use any emote
2020-08-27 21:04:36 +01:00
81a7542aa6
Merge pull request #12834 from silicons/clickcd_experimental
...
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
8d9c94c087
aliens can remove embeds now
2020-07-27 17:59:05 +01:00
b20e3bc2b6
monkey attacks
2020-07-23 16:30:27 -07:00
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
993b4ec222
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-16 19:39:46 -07:00
5f9364c5f8
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
a625d6562b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
2020-07-08 22:02:03 -07:00
6cbab55ef8
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-07 21:07:58 -07:00
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
280d3de6c3
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-07 18:37:45 +03:00
e3b1ca4942
Linter.
2020-07-03 19:57:38 +02:00
bde80eb1fb
Fixing obscured inventory slots (un)equip block, for real.
2020-07-03 19:02:20 +02:00
20245f7319
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-30 02:30:29 +03:00
c5cbfa64e5
Porting further material datum features and improvements.
2020-06-24 20:45:17 +02:00
c41d2e78be
Conflicts!!!
2020-06-22 17:39:24 +03:00
2cd18f3dba
Merge pull request #12557 from silicons/life
...
Splits Life() into procs for physical and biological life processes in preparation for stasis beds
2020-06-21 18:32:58 -05:00
48c13fcc10
Removing now unused old embed behavior
2020-06-20 00:15:52 +02:00
445d94f335
haha whew
2020-06-17 21:32:10 -07:00
ceba739231
Cooonflicts
2020-06-16 01:23:42 +03:00
7fbfb4ad0e
Merge remote-tracking branch 'upstream/master' into embed-changes
2020-06-15 22:48:26 +01:00
4c55e86da7
part 2
2020-06-10 23:14:25 +01:00
19f215477e
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
433bd1af79
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-27 18:11:15 -07:00
841bb86181
Fixing blindness stuff.
2020-05-25 16:10:25 +02:00
e4eb49050c
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-24 15:03:06 -07:00
9d04b0835b
Conflicts galore
2020-05-21 21:08:12 +03:00
9eccef2836
Porting "Personal interaction messages to simple animals" and more. ( #12268 )
...
* Porting "Personal interaction messages to simple animals" and more.
* Travis check.
* doc
* whoopsie.
* )
2020-05-18 04:46:57 -07:00
75dec8ce2c
Ports "Removes the absolute istype fest from footsteps" ( #12259 )
...
* Ports "Removes the absolute istype fest from footsteps"
* Update species.dm
2020-05-18 04:46:22 -07:00
0d92783a91
oops. ( #12242 )
2020-05-14 00:22:57 +02:00
raspy-on-osu