Commit Graph

153 Commits

Author SHA1 Message Date
Markolie
f27f72e61b ERT fixes 2016-10-26 03:05:51 +02:00
KasparoVy
cd9b12086b Merge remote-tracking branch 'upstream/master' into repathing-sprite-accessories 2016-08-26 02:28:47 -04:00
Fox-McCloud
8cd6e58c07 updates 2016-08-21 11:44:54 -04:00
KasparoVy
29a90bff9f Conflict resolution. 2016-08-18 03:28:03 -04:00
KasparoVy
e0bfbd0af6 Keeping up to date. 2016-08-17 02:56:34 -04:00
Fox-McCloud
41a74fb865 Malf AI Rework 2016-08-11 05:16:06 -04:00
TheDZD
91f18ac1d7 Merge pull request #5393 from Fox-McCloud/fast-processing
Adds in Fast Processing
2016-08-10 18:21:00 -04:00
KasparoVy
3610cfd4ea Markings refactor, body/marking/head accessory/hair sprite darkening, adds tail markings, more hair styles...
Tajara ears are on their head now, fixes a crash bug with tail wagging
with body accessories that are split-rendered, adds secondary
hair/facial hair themes, fixes issues with human/skrell arm/lower body
sprites etc.
2016-08-09 22:01:45 -04:00
Fox-McCloud
8cd140e48a Adds in Fast Processing 2016-08-09 06:55:00 -04:00
Fox McCloud
607642d4ef Revert "Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more..." 2016-08-08 23:26:51 -04:00
Fox McCloud
86d0c0b2b9 Merge pull request #5147 from KasparoVy/tail-markings
Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
2016-08-08 21:58:45 -04:00
Crazylemon64
031dd2bb3d Iiiiit's merge conflict time!
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
2016-08-07 23:42:02 -07:00
Fox McCloud
a15721b22a Merge pull request #5209 from Krausus/OnceYouLeaveYouCannotComeBack
Changes to Player Respawnability
2016-08-03 19:12:04 -04:00
Crazylemon64
bf2bcbce67 Removes most hard-coded z level checks 2016-07-31 21:29:03 -07:00
Crazylemon64
ae43de3652 Integrates the z level manager with the space transition system 2016-07-29 19:11:36 -07:00
KasparoVy
769a100580 Parallax revert. remote-tracking branch 'upstream/master' into tail-markings 2016-07-28 19:00:53 -04:00
Tigercat2000
288af9f92c Revert "Merge pull request #4739 from monster860/vg-parallax"
This reverts commit 451c934379, reversing
changes made to 64f26d999f.

Conflicts:
	SQL/paradise_schema.sql
	SQL/paradise_schema_prefixed.sql
2016-07-28 15:48:27 -07:00
KasparoVy
39d3d64207 Staying up to date. 2016-07-28 17:02:07 -04:00
monster860
b2cb87edc9 Merge branch 'master' into vg-parallax 2016-07-28 16:45:10 -04:00
Krausus
dc9591e502 More respawnability changes
- Respawning as a drone now ignores respawnability again
- Respawning as ERT now ignores respawnability again, but respawnable
ghosts get first dibs
- Becoming a non-respawnable ghost once means all future ghosting will
be be non-respawnable, unless you are sent back to the lobby
- Posibrains now disqualify non-respawnable ghosts, and are more fickle
about pinging
2016-07-27 02:27:50 -04:00
KasparoVy
0232a7a427 Keeping up to date. 2016-07-21 11:57:15 -04:00
TheDZD
6d095d50f5 Merge pull request #5102 from Fox-McCloud/reagent-refactors-continued
More Reagent Refactoring and Cleanup
2016-07-21 10:12:14 -04:00
Fox-McCloud
5fdad7355b more OOP 2016-07-21 06:33:39 -04:00
Fox-McCloud
00a470fd6d removes stupid sdisabilities 2016-07-21 02:24:54 -04:00
Fox-McCloud
a58c85941b More Reagent Refactoring 2016-07-19 14:06:41 -04:00
KasparoVy
005066d891 Merge remote-tracking branch 'upstream/master' into tail-markings 2016-07-17 19:25:03 -04:00
SamCroswell
15a8b1d7d6 Merge Conflict Resolution 2016-07-16 18:47:18 -04:00
KasparoVy
b274703a18 Adds Alt Heads
known issues: no CMA support for changing alt heads
cant change alt head after you spawn in

To do: Finish unathi sharp snout lower marking
2016-07-16 00:10:42 -04:00
Fox McCloud
7c790a8b21 Merge pull request #4780 from Crazylemon64/space_ruins
Crazypilot's Space Ruins Port
2016-07-15 22:55:51 -04:00
SamCroswell
0466499f86 Personal Crafting - Initial Commit 2016-07-15 16:25:37 -04:00
KasparoVy
766245091b Back up to date. 2016-07-15 13:00:35 -04:00
monster860
94c1a4e08e Merge branch 'master' into vg-parallax 2016-07-08 14:51:30 -04:00
Crazylemon64
0e50e4f27a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-07-02 15:37:58 -07:00
FreeStylaLT
fb12e713a7 LETS ALL TAKE A MOMENT TO REMEMBER TO USE MAPMERGER. ESPECIALLY ME. PLEASE. FOR THE SAKE OF ALL THAT IS HOLY PLEASE. 2016-07-02 18:26:20 +03:00
TheDZD
df961b29bc Merge pull request #4829 from Fox-McCloud/patch-the-patches
Instant Patch Features
2016-07-01 22:08:27 -04:00
TheDZD
506f6885a8 Merge pull request #4834 from Fox-McCloud/emote-revert
Reverts Emote System
2016-07-01 20:36:40 -04:00
Fox-McCloud
fa240a7c56 tweaks 2016-07-01 19:59:09 -04:00
Tastyfish
4dd64607dd Makes Space Hotel Great Again (#4700) 2016-06-30 20:42:29 -04:00
Fox-McCloud
a2ac239426 Reverts Emote System 2016-06-30 19:13:13 -04:00
Fox-McCloud
cf1a584995 Instant Patch Features 2016-06-30 09:55:35 -04:00
KasparoVy
38717e3b03 Fragments Markings, Adds Tail and some Body Markings, Tajara Heads now have Ears
Adds Tajara inner ear and muzzle colouration as head markings, adds muzzle colouration for Unathi (sharp and round) as head markings, adds belly colouration for Tajara and Unathi as body markings.
Fixes issue where the Unathi stripe marking name in sprite_accessories was incorrect.
Also fixes a bug where setting your IPC's head to 'normal' gave it a random screen style that was often not compatible with the monitor head.
Does a bit of tidying up in tail generation mainly, but also in icon skin-tone handling and just about everywhere else I ended up working.
Adds ears to Tajara heads. Removes ears from tajara hairstyles.
Removes the now pointless Tajaran Ears hairstyle and renames the Tajaran hair objects appropriately.
Adds a Vulpkanin Body Marking and some Tail Markings.
2016-06-27 05:29:01 -04:00
Kyep
d28cb5e8bc Allows admins to save their CC characters (#4717)
* Initial Checkin

- Creates two new admin-only jobs, "Nanotrasen Navy Officer", and
"Special Operations Officer". The former is for IC investigations by
admins of situations on the Cyberiad, and spawns in the admin room. The
latter is for leading/overwatching ERT teams, and spawns at the ERT
office.
- Neither of these jobs are accessible to normal players, either on
join, in preferences, or as a random job.
- When they are spawned, no announcement is made, and they do not show
up on the crew manifest.
- In other news, the "select equipment" debug verb has also been
adjusted so that NT Navy Officers get the same equipment either way.

* Fixes teleporter on admin station so that admins can use it to teleport directly to bridge

* Fixes CC jobs not always displaying CC HUD icon for sechuds

* Adds an implant that dusts someone on their death

* Tweaks

Changes:
- CC officers now spawn with an internals box in their backpacks, like
everyone else.
- CC officers now get dust and death alarm implanters in their backpacks
on spawn, rather than automatically having the implants in their bodies.
This enables admins to test things on admin station without worrying
about dusting or having their deaths broadcast.
- Dust implants no longer provide death alarm functionality.
- Dust implants no longer process().
- Dust implants are now based on explosive implants, and can be manually
activated via deathgasp.
- CC officers now spawn with CC headsets that are named 'centcom
headset'.

* Deletes CC encryption key

* Switches to using imp_in.dust()
2016-06-26 13:57:59 -04:00
Crazylemon64
dd98f1c868 Merge remote-tracking branch 'Krausus/InvestigateFix' into space_ruins
@tigercat2000 is a butt
2016-06-24 16:42:47 -07:00
Crazylemon64
a4fde648e7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-06-24 16:03:10 -07:00
Krausus
9095f2ebe1 Fixes Investigation Logs and Runtimes
- Fixes investigation logs showing various unused subjects instead of
the ones actually in use
- Fixes runtime when trying to investigate-log
- Fixes runtime when playing the station's "welcome" sound
2016-06-24 12:30:49 -04:00
monster860
120e470458 Ports /vg/ parallax 2016-06-21 14:58:49 -04:00
Matt Milosevic
84ec23b1d2 Back where we started... 2016-06-05 00:41:45 +02:00
Matt Milosevic
a162488f03 Totally refactors and updates the ruins code 2016-06-03 21:26:25 +02:00
VampyrBytes
df3b180af4 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DatumEmotesMK2 2016-05-26 12:32:47 +01:00
Fox McCloud
5395a0515d Merge pull request #4365 from CrAzYPiLoT-SS13/changelog_change
Adds unread changes notification
2016-05-25 19:24:44 -04:00