Verkister
2ac2a6ee3c
Readds closed eyes marking
...
Noticed something got kaleidonoped
2021-03-28 20:21:27 +03:00
Novacat
d24af2eb43
Merge pull request #10028 from Meghan-Rossi/eventhud
...
Makes the event HUD work
2021-03-27 12:18:54 -04:00
Meghan-Rossi
a2ad82c627
Adds event hud to admin_verbs_admin
2021-03-27 16:01:53 +00:00
Meghan-Rossi
fb150ae5aa
Update code/modules/mob/living/carbon/human/human_helpers.dm
...
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com >
2021-03-27 15:57:59 +00:00
Meghan-Rossi
6bf9d8b002
Makes the event HUD work
...
*Finishes up the partially-implemented event HUD (The one the event pref in the VORE character setup tab is for) and adds a verb to let event managers give it to people (can be used by right-clicking them, or from the "Fun" verb tab.
Tested.
2021-03-27 06:35:18 +00:00
Atermonera
82ab4011cc
Merge pull request #7997 from Verkister/patch-69
...
Fixes naked ghosts
2021-03-26 20:11:56 -04:00
Novacat
2664382e67
Merge pull request #9976 from H0lySquirr3l/master
...
Micro March beta update.
2021-03-26 19:21:57 -04:00
Novacat
9363056e60
Merge pull request #10012 from Hatterhat/rutile-moment
...
using rutile in alloys no longer makes slag
2021-03-26 09:45:46 -04:00
Atermonera
45ad945a12
Ported updated decls repository from Neb.
2021-03-25 22:27:54 -04:00
Schnayy
857e16e645
Merge pull request #8007 from Atermonera/RUST_revival_pt2
...
Fixes mapped R-UST connections, removes debug logs
2021-03-25 21:04:50 -04:00
Novacat
c7a072bdc5
Merge pull request #10019 from VOREStation/upstream-merge-7960
...
[MIRROR] Fixes replica syndi suit worn sprite
2021-03-25 14:35:53 -04:00
Atermonera
87df394d2b
Merge pull request #7989 from Atermonera/roofing_fix
...
Fixes roofing tiles not working in multiz areas
2021-03-25 14:09:20 -04:00
Atermonera
2038cd416d
Merge pull request #7960 from Atermonera/replica_suit_sprite_fix
...
Fixes replica syndi suit worn sprite
2021-03-25 14:06:01 -04:00
Heroman
be395382e9
Makes typing indicators scale again
2021-03-26 03:41:22 +10:00
Hatterhat
3b678d8c65
lets not make slag kkthx
2021-03-24 16:39:29 -05:00
Heroman3003
86e723ad36
Merge branch 'master' into idfix3
2021-03-25 04:20:31 +10:00
Verkister
01b4560275
Fixes a thing that somehow never got mirrored here
...
Fixes a couple ancient comments that the mirrorbot somehow missed completely.
2021-03-24 11:49:19 +02:00
Heroman
fc1d4da50b
More fixes for god of fixes
2021-03-24 19:16:23 +10:00
Heroman
5faf57d8e6
Also refactors them all a lil.
2021-03-24 15:47:10 +10:00
Heroman
5ad1c15b98
Fixes Fluff and ITG ID cards
2021-03-24 15:17:45 +10:00
Novacat
333aac76ac
Update standard.dm
2021-03-23 18:56:26 -04:00
Atermonera
18bd1c2aa2
Merge pull request #7998 from MistakeNot4892/eyecon
...
Deletes unused var.
2021-03-23 18:48:17 -04:00
Unknown
74c8af64e2
Technomancer Fixes
...
-Instability no longer causes a feedback loop if a bunch of people are clumped together.
-Fixes runtime with illusions
-Fixes carbonmob illusions not copying appearance correctly.
2021-03-23 15:49:19 -04:00
Novacat
5229d72483
Merge pull request #9989 from VOREStation/upstream-merge-7815
...
[MIRROR] New ID Card Design
2021-03-23 12:15:36 -04:00
H0lySquirr3l
2d66df2780
Update code/modules/vore/smoleworld/smoleworld_vr.dm
...
Co-authored-by: Meghan-Rossi <56671765+Meghan-Rossi@users.noreply.github.com >
2021-03-22 21:08:23 -05:00
H0lySquirr3l
39ca6a2d9d
Update code/modules/vore/smoleworld/smoleworld_vr.dm
...
Co-authored-by: Meghan-Rossi <56671765+Meghan-Rossi@users.noreply.github.com >
2021-03-22 21:08:18 -05:00
H0lySquirr3l
76f4213323
Update code/modules/holodeck/HolodeckControl.dm
...
Co-authored-by: Meghan-Rossi <56671765+Meghan-Rossi@users.noreply.github.com >
2021-03-22 21:07:40 -05:00
Novacat
9682ab8e3a
Merge pull request #9990 from VOREStation/upstream-merge-7990
...
[MIRROR] Allows Teshari to glide in some multiz fall conditions.
2021-03-22 01:51:01 -04:00
Novacat
57ca69c151
Update human.dm
2021-03-22 01:31:56 -04:00
Atermonera
bf490b96d1
Merge pull request #7993 from MistakeNot4892/tachikoma
...
Removed inactive platforms from the end of round laws output, gives them pilot access.
2021-03-21 23:05:11 -04:00
MistakeNot4892
9a7406aede
Allows Teshari to glide in some multiz fall conditions.
2021-03-21 22:59:36 -04:00
Killian
0ec52d3f20
New ID Card Design
2021-03-21 22:29:44 -04:00
Novacat
24c74b40b0
Merge pull request #9978 from Tenryumi/xenochimera-traits
...
Adds Xenochimera variants of some positive and negative traits
2021-03-21 20:01:21 -04:00
Cerebulon
382cbd4a93
News Update + Communicator Lag Fix ( #7973 )
...
* News Update + Communicator Lag Fix
* combined if. please merge this has been up way too long
2021-03-21 17:13:24 -04:00
Amy
2bf53c1f7b
Leaves only sharp melee + numbing fangs here for melee traits
2021-03-21 14:08:29 -05:00
Amy
72d628ea20
Jesus how did I miss that
2021-03-21 14:04:23 -05:00
Verkister
08aa31560b
Fixes scaling mode toggle verb not persisting
...
Fixes "switch scaling mode" verb not updating the mob var that the icon update code now relies on and therefore reverts the ingame toggled setting back to saved pref setting whenever icon update happens.
2021-03-21 20:54:30 +02:00
Amy
f23ed6e96b
Adds Xenochimera variants of some positive and negative traits
2021-03-20 17:45:29 -05:00
Novacat
0c70f47b2c
Merge pull request #9944 from KasparoVy/fix_dsi
...
Fix Missing DSI Roboparts
2021-03-19 22:41:28 -04:00
SpaceVampire
adc89c81b2
nvmactually
...
For some reason that seemed to make it stall on the Generating Diffs test.
2021-03-19 22:18:19 -04:00
SpaceVampire
fa6663bddd
unnecessary fix
...
Pretty sure I don't actually need to list the icon_state here, because it should inherits the icon filepath already. The person above me did it, so I just copied them.
2021-03-19 21:45:53 -04:00
SpaceVampire
7da7573b0f
aaaaaa
2021-03-19 21:24:48 -04:00
H0lySquirr3l
685d3b7187
Add files via upload
2021-03-19 17:26:29 -05:00
H0lySquirr3l
46a08ca445
Add files via upload
2021-03-19 17:24:31 -05:00
H0lySquirr3l
d076185bf1
Add files via upload
2021-03-19 17:24:09 -05:00
H0lySquirr3l
438fa21608
Add files via upload
2021-03-19 17:23:50 -05:00
MistakeNot4892
37717fe7b2
Tachikoma tweaks. ( #7988 )
...
* Fixes erroneous copypaste in tachikoma join string.
* Nerfs tachikoma speed.
* Nerfs tachikoma armour.
* Added wirecutters and welder to recon platform kit.
* Swaps the explo platform chainsaw to emag item, gives them a machete instead.
* Prevents ghosts from mousedropping crates onto platforms.
2021-03-19 05:04:00 -04:00
Killian
c9ceca7c43
Update neutral.dm
2021-03-18 17:13:27 +00:00
Killian
ce61330407
Update neutral.dm
2021-03-18 17:11:32 +00:00
Novacat
6639eb9d30
Merge branch 'master' into upstream-merge-7935
2021-03-18 10:42:23 -04:00