cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-07 14:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,916 Commits 8 Branches 26 Tags
d6e8a28ebebf57694fcbe7da2dcb2df241bc36e4
Commit Graph

17686 Commits

Author SHA1 Message Date
Novacat
d6e8a28ebe Merge pull request #9958 from VOREStation/upstream-merge-7968 
[MIRROR] Clicking on turfs while dragging something no longer closes the door
 2021-03-18 10:39:56 -04:00
Novacat
7646d7ad05 Merge pull request #9960 from VOREStation/upstream-merge-7974 
[MIRROR] Added Doctress' Jager drink.
 2021-03-18 10:39:37 -04:00
Novacat
dd01ae71ab Merge pull request #9961 from VOREStation/upstream-merge-7976 
[MIRROR] Fixes Global and Fixes Eyes
 2021-03-18 10:39:27 -04:00
Novacat
711c8f9685 Merge pull request #9968 from VOREStation/upstream-merge-7980 
[MIRROR] GPS presentation/update tweaks/fixes.
 2021-03-18 10:39:03 -04:00
Novacat
96173e6fc2 Update items.dm 2021-03-18 10:28:35 -04:00
Atermonera
da20d3f024 GPS presentation/update tweaks/fixes. 2021-03-18 05:03:53 -04:00
Atermonera
756c21fbcf Merge pull request #7985 from kcin2001/patch-1 
adds ticket redemption
 2021-03-18 04:57:18 -04:00
Novacat
1536b98caa Fixes Global and Fixes Eyes 2021-03-18 04:51:04 -04:00
Atermonera
3be2f30df2 Added Doctress' Jager drink. 2021-03-18 04:37:30 -04:00
Atermonera
4d5639d874 Merge pull request #7968 from Shadow-Quill/Door-Pulling-QOL-Fix 
Clicking on turfs while dragging something no longer closes the door
 2021-03-18 04:16:33 -04:00
Unknown
af975aa70b Updates Department Flags 2021-03-12 19:09:55 -05:00
Unknown
f8910213bf Fixes bug with entertainer 2021-03-12 18:59:27 -05:00
Unknown
f5330aa1c5 Moves Technomancer logs to attack_log 2021-03-12 17:35:11 -05:00
Unknown
213d383c09 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697 2021-03-11 10:01:39 -05:00
Novacat
9d2061a085 Merge pull request #9913 from Heroman3003/sect-drone 
Adds a new maint pred mob
 2021-03-11 09:48:13 -05:00
Heroman
124a357e65 Adds a new maint pred mob 2021-03-11 17:49:37 +10:00
Unknown
d2e4c326fb Fixes fighters being so slow 2021-03-10 19:46:54 -05:00
Heroman
b936cd6f25 Updates the _vr recipies to include copper. 2021-03-11 06:35:28 +10:00
Novacat
401f1eaa62 Merge pull request #9897 from VOREStation/upstream-merge-7963 
[MIRROR] Tweaked implant loadout, refactored implant detection.
 2021-03-10 14:40:05 -05:00
Novacat
5e3e76ddf9 Merge pull request #9895 from Novacat/nova-basicfixes 
Fixes Industrial Expansion
 2021-03-10 14:26:53 -05:00
Unknown
c92fbc73fe Compatability 2021-03-10 14:24:14 -05:00
Atermonera
13889abe61 Tweaked implant loadout, refactored implant detection. 2021-03-10 14:18:58 -05:00
Novacat
5b249903d4 Merge pull request #9894 from VOREStation/upstream-merge-7955 
[MIRROR] Adds an advanced version of the mining drill scanner.
 2021-03-10 14:17:21 -05:00
Unknown
c63e3521d9 Mech fabricator does not have hidden materials. 2021-03-10 14:17:01 -05:00
Unknown
beb3896d98 Fixes Industrial Expansion 2021-03-10 14:07:33 -05:00
Atermonera
26be40158e Merge pull request #7955 from FenodyreeAv/MiningScanner 
Adds an advanced version of the mining drill scanner.
 2021-03-10 13:59:00 -05:00
Atermonera
02d8653734 Merge pull request #7949 from Meghan-Rossi/e-cig 
E-cigarette improvements
 2021-03-10 13:51:46 -05:00
Novacat
25920838d5 Merge pull request #9871 from VOREStation/upstream-merge-7938 
[MIRROR] The Arcade Machine Update
 2021-03-09 19:03:00 -05:00
Novacat
b782fed522 Merge pull request #9867 from VOREStation/upstream-merge-7928 
[MIRROR] Added a GPS compass.
 2021-03-09 17:58:49 -05:00
Unknown
620da227bd Resets GPS.dm 2021-03-09 17:43:49 -05:00
Novacat
466b0af3b8 Merge pull request #9815 from VOREStation/upstream-merge-7927 
[MIRROR] Removes transform from speech bubbles when speaker is scaled at less than 2x.
 2021-03-09 17:40:51 -05:00
Novacat
2dac28c26b Merge pull request #9773 from VOREStation/upstream-merge-7856 
[MIRROR] Lobby Improvements
 2021-03-09 17:32:41 -05:00
Novacat
2db0627540 Update newscaster.dm 2021-03-09 17:20:55 -05:00
Novacat
8a2dddef3a Merge pull request #9765 from VOREStation/upstream-merge-7902 
[MIRROR] Ports TGUI Security Stuff
 2021-03-09 17:17:31 -05:00
Novacat
f707e88fa5 Update newscaster.dm 2021-03-09 17:15:44 -05:00
Novacat
64a99f4437 Update newscaster.dm 2021-03-09 17:06:56 -05:00
Novacat
6abf14d67d Update newscaster.dm 2021-03-09 17:01:56 -05:00
Novacat
c5566a0045 Update brigdoors.dm 2021-03-09 16:55:34 -05:00
Novacat
d1e8ff9022 Update security.dm 2021-03-09 16:54:00 -05:00
Novacat
bc99e58b3e Update prisoner.dm 2021-03-09 16:53:27 -05:00
Novacat
817d32c101 Update mech_fabricator.dm 2021-03-09 16:38:38 -05:00
Novacat
a5bb3c3a5a Update mech_fabricator.dm 2021-03-09 16:38:18 -05:00
Novacat
139800d6f2 Update autolathe.dm 2021-03-09 15:52:26 -05:00
Unknown
190b805cad this sucks 2021-03-09 15:49:07 -05:00
Novacat
a4dfb9c97b Merge branch 'master' into upstream-merge-7756 2021-03-09 15:24:53 -05:00
Novacat
465b3ed92f Merge pull request #9869 from VOREStation/upstream-merge-7921 
[MIRROR] Adds a modular armour version of the explorer suit and adds sprites to specialist armour
 2021-03-09 15:16:52 -05:00
Novacat
cc7f72a991 Merge branch 'master' into upstream-merge-7756 2021-03-09 15:11:54 -05:00
Novacat
576edef644 Update autolathe.dm 2021-03-09 15:08:46 -05:00
Schnayy
24435fb1b0 Merge pull request #7849 from Greenjoe12345/teshchair 
Adds some new wheelchair types
 2021-03-09 01:14:49 -05:00
Novacat
dde17fefb2 Merge pull request #9876 from VOREStation/upstream-merge-7953 
[MIRROR] Fixed/generalized loadout implants.
 2021-03-08 11:52:46 -05:00