cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-06 22:29:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,945 Commits 8 Branches 26 Tags
72d628ea205d379aff06cd68ee2beadba1ea4a60
Commit Graph

40286 Commits

Author SHA1 Message Date
Amy
72d628ea20 Jesus how did I miss that 2021-03-21 14:04:23 -05: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
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
BillyBangles
1b3e00be7e Makes custom cigarettes even more custom-ier (#7925) 
* can now add multiple items to rolling papers

* adds blunt wraps and blunts

* un-scuffs the scuffed code
more scuffed up than a wooden middle school gym floor after a dodgeball game

* further optimization
 2021-03-19 03:22:19 -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
Novacat
a2f87f0316 Merge pull request #9956 from VOREStation/upstream-merge-7956 
[MIRROR] Ported Poppy the possum.
 2021-03-18 10:40:25 -04:00
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
cee3b1c290 Merge pull request #9962 from VOREStation/upstream-merge-7979 
[MIRROR] Ghosts now use their body appearance initially.
 2021-03-18 10:39:15 -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
a3f42b9301 Merge pull request #9964 from VOREStation/upstream-merge-7981 
[MIRROR] Minor cleanup.
 2021-03-18 10:38:51 -04:00
Novacat
9290160a14 Merge pull request #9965 from VOREStation/upstream-merge-7983 
[MIRROR] Fixes pilots not getting a harness if they use a loadout uniform
 2021-03-18 10:38:42 -04:00
Novacat
359b20e0c0 Merge pull request #9966 from VOREStation/upstream-merge-7985 
[MIRROR] adds ticket redemption
 2021-03-18 10:38:21 -04:00
Novacat
96173e6fc2 Update items.dm 2021-03-18 10:28:35 -04:00
Novacat
d95800ab86 Update cat.dm 2021-03-18 10:27:47 -04:00
Novacat
19043a1115 Update bottle.dm 2021-03-18 10:26:41 -04:00
Novacat
dec2a5551f Update standard.dm 2021-03-18 10:26:04 -04:00
Novacat
fa1512d1a4 Update robot.dm 2021-03-18 10:22:58 -04:00
Atermonera
da20d3f024 GPS presentation/update tweaks/fixes. 2021-03-18 05:03:53 -04:00
Atermonera
4400641ce0 Merge pull request #7959 from Atermonera/click_catcher_examine 
Examining dark click catcher doesn't show turfs
 2021-03-18 04:58:33 -04:00
Atermonera
756c21fbcf Merge pull request #7985 from kcin2001/patch-1 
adds ticket redemption
 2021-03-18 04:57:18 -04:00
Atermonera
cffb1ba66d Merge pull request #7983 from Meghan-Rossi/pilot_tweaks 
Fixes pilots not getting a harness if they use a loadout uniform
 2021-03-18 04:56:00 -04:00
Atermonera
f498137dda Merge pull request #7981 from MistakeNot4892/cleanup 
Minor cleanup.
 2021-03-18 04:54:44 -04:00
Atermonera
f66401396c Merge pull request #7979 from MistakeNot4892/goasts 
Ghosts now use their body appearance initially.
 2021-03-18 04:52:19 -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
Atermonera
cb538688d0 Ported Poppy the possum. 2021-03-18 04:10:59 -04:00
Atermonera
20f4ff8384 Added think-tanks. 2021-03-18 04:09:42 -04:00
KasparoVy
df213a5b29 Refactor to edit polaris file and shrink _vr file. 
Requested in review by @Novacat
 2021-03-17 22:55:33 -04:00
Verkister
ae60573a7e Fixes prefless carbonmobs defaulting to fuzzy mode 
This fuzzy var is basically just reserved for character pref use and a semirecent fix on another thing moved the part of the code using this var from character spawn loading code to icon update code and therefore made it non-irrelevant for non pref-loaded humanmobs (including monkeys)

Partially fixes #9950
 2021-03-18 00:02:16 +02:00
KasparoVy
fd66a5d5aa Fix Missing DSI Roboparts 
Comment the whole lot out because the ones that weren't had imposed restrictions.
 2021-03-14 03:56:42 -04:00
Novacat
7f74202862 Merge pull request #9940 from Meghan-Rossi/talontweaks 
Talon tweaks
 2021-03-13 20:58:53 -05:00
TheFurryFeline
47652a7fff Restore VS edit of tracking implant 
Title.

🆑 
tweak - Fixes tracking implant cost to 0, not 10.
/🆑
 2021-03-13 20:24:44 -05:00
Meghan-Rossi
f716797a7f Talon tweaks 
🆑
rscadd - Added copper to the talon workshop.
rscadd - Added a stunbaton to the talon guard's locker.
rscadd - Talon jobs can now take some role restricted accessories in the loadout.
rscadd - The Talon Pilot laptop now comes with the ship navigation screen preinstalled.
bugfix - Talon can now access their own engi-vend.
tweak - Talon Pilot ids now show the full job title instead of just 'Pilot'.
/🆑
 2021-03-13 21:58:13 +00:00
Heroman
13e41980dc Blackeyes too 2021-03-13 15:34:30 +10:00
Heroman
4c4a8bc7ef Makes shadekin not have glowing eyes by default 2021-03-13 15:18:32 +10: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
Novacat
2993d89568 Merge pull request #9930 from Novacat/nova-basicfixes 
Slightly nerfs cold adaptation
 2021-03-12 18:22:36 -05:00
Unknown
f5330aa1c5 Moves Technomancer logs to attack_log 2021-03-12 17:35:11 -05:00
Novacat
a0a61b62b9 Merge pull request #9933 from Heroman3003/verminfix 
Fixes vermin infestation event not working right sometimes
 2021-03-12 16:04:21 -05:00
Heroman
efb4882060 Fixes vermin infestation event not working right sometimes 2021-03-13 06:52:54 +10:00