Commit Graph

8841 Commits

Author SHA1 Message Date
Aronai Sieyes
3902093a31 Merge pull request #2991 from Haery70/master
Haery70 - adds Cookiegirl mobs
2018-02-11 14:53:20 -06:00
Verkister
519adc1c3e Update badboi.dm 2018-02-10 23:36:24 +02:00
Verkister
d240032910 some changes 2018-02-08 10:57:45 +02:00
Verkister
7afc963393 Adds a fancy new voremob.
-"corrupt hound". Basically a messed up evil feral borgo.
-Currently only available without bus shenanigans through the dangerous pred crate. Could be added to some expeditions and such I guess.
-Loot drops illegal borg upgrade module.
2018-02-08 10:11:42 +02:00
Haery70
543574dbfd Update cookiegirl.dm 2018-02-07 23:59:07 -05:00
Haery70
5bcdd2b707 Update cookiegirl.dm
Editing a part on the examine text regarding the nipples. No need for that.
2018-02-07 23:57:02 -05:00
Haery70
66fbb3d485 Add files via upload 2018-02-07 23:21:18 -05:00
Aronai Sieyes
999597dad1 Merge branch 'master' into polaris-sync-2018-02-07 2018-02-07 23:06:03 -05:00
Aronai Sieyes
0a415d0047 Merge pull request #2988 from VOREStation/aro-aerostat
Exploration Update #3
2018-02-07 22:22:01 -05:00
Arokha Sieyes
c871e617db VS: Swap two things to ion pistol rather than rifle 2018-02-07 20:03:44 -05:00
Arokha Sieyes
fb62a2fe45 VS: Two mob tweaks to make them better
Syndicate and hivebot
2018-02-07 20:03:41 -05:00
Arokha Sieyes
c493b83531 VS: Simple_animals avoid my custom sky too 2018-02-07 20:03:41 -05:00
Arokha Sieyes
8684fcf4eb POLARIS: Allow simple_animal to avoid turfs
Like the sky. TODO: Lava??
2018-02-07 20:03:41 -05:00
Arokha Sieyes
54b6e9de7d VS: Fix a totally unrelated qdel gc bug with a planemaster 2018-02-07 20:03:40 -05:00
Arokha Sieyes
deef737212 POLARIS: New mob var 'low_priority' for skipping life()
Mobs with this will not have life() called on them unless there's a non-observing player on the same z-level.
2018-02-07 20:03:40 -05:00
Arokha Sieyes
1496a17e63 VS: Adds two mobs: shadekin, jelly
Shadekin is WIP for now, can be used for events. Jelly is on Virgo 2.
2018-02-07 20:03:39 -05:00
Leshana
1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme
2018-02-07 19:30:50 -05:00
Verkister
78ab5c37f4 Squashed commit of the following:
commit 88761abcbdad12b25e4771837331ee3c40aeff19
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Feb 7 11:58:47 2018 +0200

    Some more gurgle related tweaks and fixes.
    -Removes gut transfers passing along preserved items list. (redundant with modern digest_act)
    -Adds panel update to trash eating.
    -Fixes borg sleeper gurgles causing double, maybe even triple damage due to being added into processing_objects list multiple times.
2018-02-07 12:01:11 +02:00
Anewbe
8dcaeed33d Merge pull request #4728 from Cyantime/patch-1
Attacked mobs will always target attacker
2018-02-06 23:59:23 -06:00
Neerti
3fd1571a4b Merge pull request #4724 from Anewbe/ghettoChutes
Fixes ghetto chutes
2018-02-06 14:14:30 -05:00
elgeonmb
f352cf2ccc very small grammar fix
it's -> it is, it has
its -> belonging to it, of it
2018-02-05 22:42:11 -08:00
Cyantime
46f9b36400 Attacked mobs will always target attacker 2018-02-05 19:12:45 -05:00
Leshana
5847319443 Update every initialize() proc to return an initialize hint.
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-05 15:50:13 -05:00
Spades
2dfa526b7a Merge pull request #2972 from VOREStation/aro-lang
Removes several ways to know every language
2018-02-05 05:21:02 -05:00
Cerebulon
c28d64e91d Shantak Piss Fix 2018-02-05 06:56:24 +00:00
Anewbe
3e31b6678f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into ghettoChutes 2018-02-05 00:53:33 -06:00
Anewbe
67e22cf0a6 Closets and Mechs no longer prevent death by freefall 2018-02-05 00:53:12 -06:00
Anewbe
7ada0973ee Merge pull request #4718 from VOREStation/aro-ghostmsg
Cut down ghosting admin spam
2018-02-04 22:33:56 -06:00
Aronai Sieyes
bb09406ea0 Merge pull request #2934 from Verkister/yummytrash
Trashcan perk refactor and slight expansion.
2018-02-04 16:56:47 -05:00
Aronai Sieyes
f36f32afc0 Merge pull request #2970 from VOREStation/aro-admenucleanup
Remove several admin verbs from context menu
2018-02-04 16:27:33 -05:00
Verkister
f553219bbd Squashed commit of the following:
commit b3d348258c4c93a1df81652bdf68fd00f4130369
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Feb 4 22:40:08 2018 +0200

    Squashed commit of the following:

    commit 5faa5f9d063e57400584ab1ae458e626629b6842
    Author: Verkister <superverkelian@hotmail.com>
    Date:   Sun Feb 4 22:31:10 2018 +0200

        Update pai.dm

commit fd4bbdc6b99d74d94befb440ffe5e0c23a98a918
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Feb 4 11:28:58 2018 +0200

    Makes pAI cards, AI cards, and posis "edible"
    -Also makes it so that pAI cannot fold out if inside a gut.

commit 1d13c207240c4bc296b188533e8cf50b1424cc36
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Feb 4 10:40:38 2018 +0200

    some more trashcan refactoring

commit 28d02c272dbd218d2d91c91fb1ecec999b9dd05e
Author: Verkister <superverkelian@hotmail.com>
Date:   Sat Feb 3 13:32:14 2018 +0200

    Trashcan perk refactor
2018-02-04 22:43:02 +02:00
Arokha Sieyes
686c601e24 Further translator tweaks 2018-02-04 13:56:25 -05:00
Arokha Sieyes
fbb34ea0ed Remove several admin verbs from context menu 2018-02-04 12:32:55 -05:00
Arokha Sieyes
8b6c76af81 POLARIS: Cut down ghosting admin spam 2018-02-04 01:53:23 -05:00
Arokha Sieyes
85c8c123f1 POLARIS: Cut down ghosting admin spam 2018-02-04 01:52:39 -05:00
Cameron653
1999fc2a2a Changes 'undislocate' to 'relocate' (#4650)
* Chaning undislocate to relocate.

Have to use web browser for this one at the moment.

* Changes undislocate -> relocate

* Last file to change to relocate

* Changes it to the best medical term for the action.

* Reduce -> Relocate
2018-02-03 22:45:50 -06:00
Aronai Sieyes
66bd426cbc Merge pull request #2913 from Verkister/patch-6
Changes voremob default gurglemode to itemweak
2018-02-03 20:56:37 -05:00
Anewbe
6f8d35a2b3 Merge pull request #4708 from Cameron653/patch-6
Moves var/get_rig_stats to the correct file.
2018-02-03 19:51:37 -06:00
Aronai Sieyes
125cb2f102 Merge pull request #2956 from VOREStation/aro-noborgono
Bad dog down boy
2018-02-03 20:08:25 -05:00
Aronai Sieyes
f920551f37 Merge pull request #2946 from VOREStation/vplk-ss-atoms
Atoms Initialization Subsystem
2018-02-03 20:08:05 -05:00
Arokha Sieyes
c2d5507f21 Bad dog down boy
Removes ability of the AI to see borg cameras when they are away from the station (no UFO spying)
Also removes borg ability to mess with doors on UFO (aliennn technologyyy)
2018-02-03 19:34:45 -05:00
MarinaGryphon
72318d46b6 Replaces most of the gender macros. (#4681)
* Fixes #4632.

* 1:27 am coding best coding

* fixes a warning

* Removes the last of the gender macros. Gender is dead.

* gender II: the travis-ing

* linebreaks are dead too.

* oops i accidentally the gender, also ambiguous gender is now taken into account for get_visible_gender
2018-02-03 14:40:09 -06:00
Cameron653
d938963131 Moves var/get_rig_stats to a proper area. 2018-02-03 14:17:49 -05:00
Verkister
610ebf2a39 Nerfs borg sleeper carcass gain.
mice op
2018-02-03 11:15:35 +02:00
Leshana
cef001bf2a Update every initialize() proc to return an initialize hint.
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-03 01:00:57 -05:00
Leshana
4f98fad36b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01
# Conflicts:
#	.travis.yml
#	code/_away_mission_tests.dm
#	code/modules/admin/verbs/mapping.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z10.png
#	nano/images/nanomap_z2.png
#	nano/images/nanomap_z3.png
#	nano/images/nanomap_z5.png
#	nano/images/nanomap_z6.png
2018-02-01 23:55:47 -05:00
Anewbe
4b4e3bb6f1 Merge pull request #4672 from elgeonmb/patch-1
humans can be older
2018-02-01 15:21:36 -06:00
Aronai Sieyes
cc857cab00 Merge pull request #2917 from VOREStation/vplk-reghosts
Make ghosts invisible again.
2018-01-31 14:41:41 -05:00
Verkister
a9de3de294 Changes voremob default gurglemode to itemweak
It's just kind of a bummer to lose all your important gear after losing a fight if backup doesn't arrive in time. After all the item friendly mode was introduced way after vore mobs.
2018-01-31 13:46:31 +02:00
Arokha Sieyes
17723b7df6 Cleans up references to assistant
Defines the USELESS_JOB value as "Visitor"
2018-01-31 00:55:13 -05:00