cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 13:20:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,107 Commits 9 Branches 26 Tags
5b1b8fb62883a8bf809b6310bc9f6ea93fc2d773
Commit Graph

26805 Commits

Author SHA1 Message Date
Atermonera
5b1b8fb628 Merge pull request #8000 from Atermonera/ai_eye_higgs_bugson 
Fixes runtime in chunk.dm: line 91, I think?
 2021-03-31 03:48:15 -04:00
Novacat
a9bf087c8c Merge pull request #10046 from VOREStation/upstream-merge-7965 
[MIRROR] Tanning Tweaks
 2021-03-30 16:55:15 -04:00
Novacat
f6793b6207 Update material_recipes.dm 2021-03-30 16:16:57 -04:00
Unknown
25e39e8da3 Properly garbage collects carp 2021-03-30 12:36:14 -04:00
Atermonera
72d1741b6b Tanning Tweaks 2021-03-30 01:50:39 -04:00
Unknown
18e0d9a064 Fixes Teshari 
Load order fixed
 2021-03-29 14:49:29 -04:00
Novacat
8844a0cb02 Merge pull request #10032 from Novacat/nova-ert 
Adminbus Area Modifications
 2021-03-29 13:21:54 -04:00
Novacat
fc7a613a7a Merge pull request #10035 from Heroman3003/weak-ass-webs 
Makes weaversilk webs die from everything, not just fists + stun timer fix
 2021-03-29 09:43:02 -04:00
Heroman
723a825400 Makes modifying ID cards not change the department if rank wasn't changed 2021-03-29 21:10:09 +10:00
Unknown
6baf3b43ec Does some fixes 2021-03-29 03:01:45 -04:00
Heroman
0245e18f61 And mobs are allowed to break stuff too 2021-03-29 16:30:08 +10:00
Heroman
27c75038db Also makes the stun time use appropriate measurements 2021-03-29 16:16:06 +10:00
Heroman
8c3d92672a Makes weaversilk webs die from everything, not just fists 2021-03-29 16:06:48 +10:00
Novacat
fc0ed975c5 Merge pull request #10029 from Very-Soft/morealtids 
MORE ALT ID STUFF
 2021-03-28 19:58:35 -04:00
Novacat
b4d376553b Merge pull request #10025 from VOREStation/upstream-merge-7991 
[MIRROR] Repathed/renamed seromi to teshari.
 2021-03-28 17:32:50 -04:00
Unknown
a13226830b Oversight 2021-03-28 16:38:02 -04:00
Unknown
c072f96104 Compatibility Fixes 2021-03-28 16:20:09 -04:00
Novacat
9200b78db6 Update pda.dm 2021-03-28 16:04:37 -04:00
Verkister
2ac2a6ee3c Readds closed eyes marking 
Noticed something got kaleidonoped
 2021-03-28 20:21:27 +03:00
VerySoft
da6f853210 MORE ALT ID STUFF 
So basically I made one for all the station jobs, and then made one that when you use it, will become whatever job you are when you use it the first time. I added these to the loadout under utility as contractor identification cards!

I also did the same thing for the ITG IDs, but I did not put them on the loadout. People can fluff for them if they want to though! ITG is just a little more stringent in its hiring process than NT is.

I ALSO put in tons of pieces (which I used to make most of these) so that if someone wants to make more of them, or modularize some of them for whatever, they can! There's some alternative icon types and stuff in here too for making IDs for factions that don't exist or whatever! :0

I also removed Harmony's fluff ID and replaced it with the polymorphic ITG ID, since it's effectively the same thing but more generalized.
 2021-03-27 20:55:16 -04: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
Atermonera
c586a83071 Repathed/renamed seromi to teshari. 2021-03-26 15:38:02 -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