cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 21:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,582 Commits 9 Branches 26 Tags
072a40dea3f6515e3da1121bbb42e80cde2f7c4a
Commit Graph

8668 Commits

Author SHA1 Message Date
Arokha Sieyes
072a40dea3 Make digest_act even more generic (and contaminate) 
Now returns nutrition that should be gained, and accepts an internal_contents list and where you want subobjects placed
 2018-01-10 10:02:13 -05:00
Arokha Sieyes
449dcbb0b7 Refactor Digestion 2018-01-10 02:06:13 -05:00
Arokha Sieyes
05864e06ea Merge pull request #2719 from VOREStation/aro-layer 
Make laying people be under other people
 2018-01-09 20:33:54 -05:00
Arokha Sieyes
68e7efa2b2 Merge pull request #2718 from Cyantime/boxfix 
Actually fixes snakesnack box
 2018-01-09 20:25:16 -05:00
Cyantime
be875510f3 Actually fixes snakesnack box 2018-01-09 18:51:14 -05:00
Arokha Sieyes
0bee7979d9 Make laying people be under other people 
Unsure what consequences this would have. PLEASE REVIEW. (It works fine ingame, but I can't test every object with every mob)
 2018-01-09 18:16:17 -05:00
Cyantime
81937179ec Fix snakesnack box 2018-01-09 18:06:03 -05:00
Leshana
807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09 
# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#
 2018-01-09 14:40:09 -05:00
Verkister
d8f3a7d972 Updates science borgo for the updated icon stuff 
dogborg is true
 2018-01-08 17:01:09 +02:00
Cyantime
46c99cca03 Improves medibot speaker switch 2018-01-07 22:09:43 -05:00
Arokha Sieyes
080a9234d6 Merge pull request #2699 from kcin2001/scidog 
adds i new science dogborg and 2 dogborg reskins
 2018-01-07 21:35:55 -05:00
Cyantime
6e50929df5 Fixes 2018-01-07 12:56:07 -05:00
Arokha Sieyes
7dd9bd3e55 New Science Dogborg 2018-01-07 00:05:10 -05:00
Cyantime
af8cec54ab Fixes gravekeeper module wood synth, fixes typo in gravekeeper lawset (#4506) 
* Fixes gravekeeper module wood synth, fixes typo

* Gives the grave gripper a name
 2018-01-06 20:20:01 -06:00
Cyantime
ebb8d287cf Returns noodle to the CE's office 2018-01-05 22:56:33 -05:00
Leshana
6b87ecd2b8 Merge pull request #2685 from VOREStation/aro-lessmagic 
Tweak lethal succubus drain
 2018-01-05 14:22:39 -05:00
Anewbe
2b2a5dc565 Merge pull request #4503 from Neerti/1/1/2018_bonfires 
Adds Bonfires
 2018-01-05 13:36:19 -05:00
Arokha Sieyes
1110d6cf82 Tweak lethal succubus drain 
Mostly remove the OOC magic-implying wording about 'life energy' (since setting is w/o magic) so it can be whatever in your private RPs (someone was asking about using it to represent stealing bodyheat which is cool).
`absorbing_prey` was never unset if they were found to be indigestible, so fixed that
Two stages also sent two messages at the same time
Removed the needless casting of src to C since it's defined on human already

Maybe in the future consider using cloneloss instead of brainloss? Alkysine is one of the easiest drugs to make, and if I jack myself up with it I'd maybe be immune to having my nutrition/heat/whatever stolen which seems ~unusual~
 2018-01-05 10:59:20 -05:00
Arokha Sieyes
ce0b3e9678 Merge pull request #2664 from Verkister/buppers 
Fixes non-dogborgs butting into dogborg icon update territory.
 2018-01-05 10:11:13 -05:00
Arokha Sieyes
7bd32b056d Merge pull request #2676 from Screemonster/bellybugs 
Fixes some bugs relating to absorption and struggling, makes struggle feedback messages clearer
 2018-01-05 10:10:46 -05:00
Arokha Sieyes
82f373aa1e Merge pull request #2672 from Cameron653/EMERGENCY 
January Sync
 2018-01-05 10:04:41 -05:00
Neerti
42a421e8e1 Adds Bonfires 2018-01-05 02:35:19 -05:00
Leshana
28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04 
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme
 2018-01-04 22:44:04 -05:00
Screemonster
9f15ee88a0 Adds vore panel preference to enable/disable being eaten by mobs 2018-01-05 02:53:13 +00:00
Screemonster
3090acdceb does the absorb-release-thing more betterer 2018-01-05 01:08:22 +00:00
Screemonster
a0b02b57c1 fixes some bugs in absorption and struggling 2018-01-04 23:49:06 +00:00
Neerti
250fe6e2ff Fixes Exploit with Power Tools 2018-01-04 03:08:56 -05:00
Neerti
58a8e6a066 Merge pull request #4499 from Neerti/1/3/2018_why 
Fixes Exploit with Power Tools
 2018-01-03 15:50:02 -05:00
Neerti
5a0a04d2dd Fixes Exploit with Power Tools 2018-01-03 15:40:43 -05:00
Neerti
d7b5cca562 Merge pull request #4496 from Atermonera/admin_dsay 
Admins can see dsay again
 2018-01-02 23:20:39 -05:00
Atermonera
3210625822 Admins can see dsay again 2018-01-02 17:11:50 -08:00
Anewbe
1f22838bcc Merge pull request #4482 from Neerti/1/1/2018_rainbow_slime_fix 
Rainbow Slime Extracts No Longer Make Wild Slimes
 2018-01-02 20:01:38 -05:00
Verkister
43d1db6515 opto 2018-01-03 00:06:37 +02:00
Verkister
5bb962a7e0 fiixes 2018-01-02 23:36:30 +02:00
Arokha Sieyes
f7f4a15c50 Destroys botany forever 
Why do we have a robot that literally does the entire job. Basically people leave it and it becomes a lag generator forever. Removes farmbot harvesting and removal of dead plants, plus adds an idle timer for 150 process cycles without a target causing it to turn itself off. So basically it will tend the plants and keep them alive, but you need to come harvest them sometimes.
 2018-01-02 16:06:13 -05:00
Verkister
2549beea17 Fixes non-dogborgs butting into dogborg icon update territory. 
-Also adds a dogborg var for special functions such as the icon bs.
 2018-01-02 18:07:33 +02:00
Neerti
41137eeedb Rainbow Slime Extracts No Longer Make Wild Slimes 
Also renames wild slime to feral slime.
 2018-01-01 08:20:55 -05:00
Neerti
3ee3173a9f Merge pull request #4449 from Verkister/sleeby 
Enables rest icons for simplemobs that have them.
 2017-12-31 07:30:09 -05:00
Neerti
3c2dac2e01 Merge pull request #4463 from VOREStation/bay-tg-mc-update 
Port /tg Master Controller & Garbage Collection Enhancements
 2017-12-29 11:20:11 -05:00
Neerti
1c5bd19ca2 Fixes Welding 
Welding in a RIG/spacesuit is currently broken. This PR fixes it. It was broken for two reasons.
First, the proc to get flash protection assumed the RIG was a clothing item, and as such thought it had variables it doesn't. So it would runtime.
Second, spacesuit helmets lost their flash protection for some reason. This has been reversed.
 2017-12-29 01:51:37 -05:00
Arokha Sieyes
7d16c2e8cd Merge pull request #2647 from VOREStation/aro-deadchat 
Fix admin deadchat
 2017-12-28 19:10:19 -05:00
Arokha Sieyes
49f27b6b54 Fix admin deadchat 
Would be nice.
 2017-12-28 18:53:42 -05:00
Arokha Sieyes
cb0a9f009d Allow ghosts to enter Soulcatchers 
Ghosts now have a verb "Join Into Soulcatcher" that lists all players, and they can pick one to ask them if they can join into their SC. If they don't have one, it notifies the ghost (this is less expensive than trying to crunch who has a soulcatcher and shortening the list. You can just deal with it okay??). You cannot get backed up if you joined this way, like there's no way to move from being a ghost to being in someone's head to being in a mob. You'd need to ghost and respawn normally. (This is intentional... no sneaky no-manifest people getting in).

And various other SC QOL things:
- Adds NMe and NSay verbs when you get a soulcatcher installed so you can use them in the text parser at the bottom of the window or click them in the verb list like a crazy person. The older emotes also still work.
- Prevents 'loop of madness' where both pred and prey have soulcatchers and it floods your log as it tries to decide who catches who
- Removes minds if the client is disconnected for a long time, or if the player ghosts out of the NIF
 2017-12-28 16:36:43 -05:00
Leshana
a435d73450 Ports /tg controller optimizations 
https://github.com/tgstation/tgstation/pull/31092 - Fixes subsystems not returning a qdel hint
https://github.com/tgstation/tgstation/pull/31494 - In which the stoner one gets stoned and tries to address tick contention... again
https://github.com/tgstation/tgstation/pull/31950 - Removes an empty New()
https://github.com/tgstation/tgstation/pull/31951 - Logs subsystem shutdowns
 2017-12-27 21:19:55 -05:00
Arokha Sieyes
4374bef62a Merge pull request #2636 from VOREStation/aro-talkicons 
Flips talking icons to the right side
 2017-12-27 15:45:33 -05:00
Arokha Sieyes
8a349ee87c Flips talking icons to the right side 
So they don't sit under the HUD icons half the time. Kind of annoying. This is how it used to be.
 2017-12-27 02:38:52 -05:00
Arokha Sieyes
40f2dcc73b Fix unused proc in prometheans 2017-12-26 23:35:38 -05:00
Arokha Sieyes
80d69aa161 Organ coloring fix to read species var 
Since we use this var to determine how colors work
 2017-12-26 23:21:51 -05:00
Arokha Sieyes
5aad70fe29 More things for custom species to copy 
These two new vars
 2017-12-26 23:17:44 -05:00
Arokha Sieyes
d998f36c38 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018 
# Conflicts:
#	code/game/objects/structures/signs.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/organs/organ_icon.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
 2017-12-26 23:07:58 -05:00