Commit Graph

9483 Commits

Author SHA1 Message Date
Aronai Sieyes
d83c8ff0ed Merge pull request #4047 from VOREStation/upstream-merge-5396
[MIRROR] Adds new AI core sprites
2018-07-21 15:51:23 -04:00
Aronai Sieyes
939642a564 Merge pull request #4037 from VOREStation/upstream-merge-5386
[MIRROR] Add a procedure for repairing limbs via surgery.
2018-07-21 14:45:35 -04:00
Aronai Sieyes
1369c45f13 Merge pull request #4034 from VOREStation/upstream-merge-5317
[MIRROR] Dead Ringer + PoI
2018-07-21 14:43:59 -04:00
Aronai Sieyes
878b195dbb Merge pull request #4030 from VOREStation/upstream-merge-5402
[MIRROR] Language and Larynx Additions
2018-07-21 14:43:47 -04:00
Arokha Sieyes
adbb5b86a5 Fix merge conflicts 2018-07-21 11:34:54 -04:00
Aronai Sieyes
25ad449643 Merge pull request #3996 from VOREStation/upstream-merge-5394
[MIRROR] Adds an option to enable/disable markings on synth parts.
2018-07-17 23:33:50 -04:00
Spades
98352eb5bb Merge pull request #4048 from deathride58/dispvoreprefs
Hides mechanical vore preferences for mimics
2018-07-17 05:26:44 -04:00
deathride58
7d398dcb4e Hides voreprefs for mimics 2018-07-16 22:36:23 -04:00
Jonathon Key
bbaaaa1c20 Adds new AI core sprites (#5396)
* Adds new AI core sprites

* Added an overlooked sprite, gentoo

* Fixes define issue with Triumvirate

* Changes names of 2 sprites

* Changelogs are strange
2018-07-16 18:19:10 -04:00
Anewbe
e2da5d687b Merge pull request #5386 from Mechoid/End_The_Tyranny_Of_Chemistry
Add a procedure for repairing limbs via surgery.
2018-07-14 15:57:52 -04:00
drexample
090ba940a8 Dead Ringer + PoI (#5317)
* fixed photos

* Revert "fixed photos"

What was I thinking?

* Added stopwatch, deadringer, cultist mob and PoIs for them.
Made simplemobs ignore invisible people.

* Organ deletion fix.

* Test

* projectile fix + time adjustment

* initialize crate change

* Changed cultists into semi-transparent ghost people

* Removed Stopwatch for a separate PR

* Removed stopwatch trace

* removed cultists from dme

* Removed Stopwatch PoI

* Clean up unused files / stopwatch addition

* Replaced sounds with stock ones from
freesound.org
Removed icon modifications
Grammar fix
Removed unused sound files

* PoI tweaked

* Removed unused area
2018-07-14 15:16:04 -04:00
Anewbe
edf92c57f9 Language and Larynx Additions 2018-07-14 00:14:49 -04:00
Aronai Sieyes
7b8f0843a5 Merge pull request #3999 from VOREStation/upstream-merge-5401
[MIRROR] Taj Sign Language works
2018-07-12 18:09:54 -04:00
Cyantime
53bbf6a3ec Spawns off an alert in character setup. 2018-07-12 04:21:03 +00:00
Aronai Sieyes
1feb833d3f Merge pull request #3994 from Little-119/trash-birds
Gives vox the trash eating verb
2018-07-11 21:36:10 -04:00
Aronai Sieyes
caeb019672 Merge pull request #4009 from VOREStation/upstream-merge-5403
[MIRROR] Limbs can find the clothing that covers them
2018-07-11 21:35:41 -04:00
Aronai Sieyes
241fe7a09a Merge pull request #4007 from Little-119/prototype-trait-fix
Fixes the prototype trait showing up
2018-07-11 21:34:49 -04:00
Aronai Sieyes
f5ff6fec9a Merge branch 'master' into upstream-merge-5401 2018-07-11 21:31:18 -04:00
Aronai Sieyes
b547da5bfb Merge pull request #3997 from VOREStation/upstream-merge-5395
[MIRROR] Adds four new tatoos
2018-07-11 21:28:56 -04:00
Atermonera
4526b0d095 Merge pull request #5403 from Anewbe/get_clothing_on_limb
Limbs can find the clothing that covers them
2018-07-11 00:38:59 -04:00
Little-119
0420b627f2 Stops the prototype trait from showing up 2018-07-09 21:48:34 -04:00
Neerti
aff66f9037 Taj Sign Language works 2018-07-09 02:00:19 -04:00
Anewbe
c84447047c Merge pull request #5395 from elgeonmb/sabsthing
Adds four new tatoos
2018-07-08 17:37:55 -04:00
Anewbe
5fff00c4d5 Adds an option to enable/disable markings on synth parts. 2018-07-08 17:36:41 -04:00
Little-119
d68e908c9e Gives vox the trash eating verb 2018-07-07 22:46:27 -04:00
avabee
45cfd410b2 Prevents dummy AIs from spawning with communicators or PDAs. (#5392)
* Adds an 'is_dummy' variable to AIs.

* Prevents dummy AIs from spawning with communicators or PDAs.
2018-07-07 14:30:27 -04:00
Verkister
9f36a01985 Fixes sleeperbellies not ejecting contents on borg death.
-Wow it sure took a while before we found out what was forgotten during the original citadel port.
2018-07-02 13:28:59 +03:00
Atermonera
308c4b64e0 Renames Taj Sign Language 2018-07-02 00:49:17 -04:00
Aronai Sieyes
bb895947d9 Merge pull request #3950 from VOREStation/upstream-merge-5369
[MIRROR] Only slimes may squish.
2018-07-02 00:43:26 -04:00
Aronai Sieyes
2e0e39b627 Merge pull request #3949 from VOREStation/upstream-merge-5361
[MIRROR] Ports Siik'Tajr from Baystation
2018-07-02 00:36:20 -04:00
Aronai Sieyes
9a56255686 Merge pull request #3960 from VOREStation/upstream-merge-5379
[MIRROR] Fixes an infinite drowsyness bug
2018-07-02 00:32:35 -04:00
Aronai Sieyes
b23aafca9c Comment out change 2018-07-02 00:30:59 -04:00
Arokha Sieyes
ae755b776c Remove the custom Virgo version of siiktajr 2018-07-02 00:21:41 -04:00
Atermonera
9b237d0d5c Merge pull request #5379 from Anewbe/drowsy
Fixes an infinite drowsyness bug
2018-07-01 17:56:46 -04:00
Unknown
14d64a5570 Duplicate PR revert and minor bugfix
- Reverts Virgo Siik'Tajr, since Polaris decided to implement it upstream
- Fixes a bug that caused the Pathfinder's locker script to instead trigger on explorer lockers
2018-06-29 16:25:20 -04:00
Layne
a12778d773 Only slimes may squish. (#5369)
* Clandestine (Original Commit)

* Revert "Clandestine (Original Commit)"

This reverts commit cdb1abb47b3720e9160a4942a06f1b9036db2c27.

* Squish on my slime

* Squish on my slime
2018-06-29 15:56:20 -04:00
Anewbe
8b813107c1 Merge pull request #5361 from Novacat/spriteadd
Ports Siik'Tajr from Baystation
2018-06-29 15:49:56 -04:00
Verkister
82dd96a141 Adds a bunch of new sprite accessories.
-Mainly ports from old Citadel assets.
-Markings: Otter face, Otter nose, Deer face, Cloven hooves, Shepherd snout, Shepherd back.
-Head accessories: Small bear ears, Deer ears, Small antlers, Deer ears with small antlers, Caprine horns, Drake frills.
-Also fixed a Polaris blooper from our tajaran sprite file. (The legs were facing in different directions in side views.)
2018-06-29 15:32:30 +03:00
Verkister
d1ab58b7f8 Little tweaks etc.
-Renamed heckboy paths.
-Fixed a sprite inconsistency.
-New latin names.
-Feral red changed to cult faction.
-Changed red tame chance to 20%.
-Made "experimental environment" otie crate have a 20% chance to contain a friendly red instead of phoron.
2018-06-25 11:33:19 +03:00
Verkister
49e7cb1bcd Adds "redspace" oties.
-Stats-wise identical to phoron mutants for now.
-Can appear in dangerous pred crate.
-Commissioned for shenanigans etc.
2018-06-24 16:34:24 +03:00
Aronai Sieyes
859b06497b Merge pull request #3874 from Novacat/nova-pathfinder
Ports Siik'Tajr from Baystation
2018-06-24 01:02:52 -04:00
Aronai Sieyes
47dac5ae08 Merge pull request #3895 from Verkister/chompybois
Gives simplemobs and dogborgs brutal predation
2018-06-24 00:59:55 -04:00
Mechoid
382ce457ca Fix AI-drone runtimes. Get angry at commits. (#5366)
* Allows AIs to control maint/construction drones.

* Radio control online.

* Things Not Saving

* Drone control respects intellicores.

* Config control, AI drones are disableable if the AI isn't an antag.

* There's a diff so it must have saved. Right?

* No un/wrenching of the core.

* Complies to Replies.

* Fix some AI-drone runtimes.
2018-06-21 03:19:27 -04:00
Verkister
472672a834 reset module thing 2018-06-18 18:17:58 +03:00
Atermonera
0f171aa97a Merge pull request #5360 from Anewbe/aura_modifier
Adds aura style modifier code
2018-06-17 15:59:01 -04:00
Verkister
de50347dfd Gives simplemobs and dogborgs brutal predation
All these chompy bois around but only humans and pAIs are allowed to bite smh.
2018-06-17 15:00:07 +03:00
Aronai Sieyes
c06339487a Merge branch 'master' into upstream-merge-5335 2018-06-16 17:43:55 -04:00
Aronai Sieyes
abd67bb983 Merge pull request #3889 from VOREStation/upstream-merge-5282
[MIRROR] Allows AIs to produce and control maint/construction/mining drones.
2018-06-16 10:51:20 -04:00
Aronai Sieyes
dd504699e0 Merge pull request #3875 from Little-119/MSTA
Makes synths able to taste again
2018-06-16 10:47:37 -04:00
Mechoid
9b00166de0 Allows AIs to produce and control maint/construction/mining drones. (#5282)
* Allows AIs to control maint/construction drones.

* Radio control online.

* Things Not Saving

* Drone control respects intellicores.

* Config control, AI drones are disableable if the AI isn't an antag.

* There's a diff so it must have saved. Right?

* No un/wrenching of the core.

* Complies to Replies.
2018-06-15 20:15:03 -04:00