Commit Graph

209 Commits

Author SHA1 Message Date
Fox-McCloud
4419683890 Reagents Cleanup 2017-07-22 05:18:13 -04:00
Crazylemon64
37270ec7c4 Paranoid sanitization 2017-07-20 01:15:13 -07:00
Fox-McCloud
17d7232cf3 Removes Disease one and Virology 2017-07-08 23:10:17 -04:00
Fox-McCloud
08c8ba569c Adds Radio Jammers 2017-06-30 18:20:21 -04:00
Fruerlund
bde62d63b0 Records will now be saved and can be printed again
Log files will now be stored in a list and can be accessed via the
security records computer
2017-05-14 18:59:56 +02:00
Fruerlund
840326ebe0 Adds celllogs (hopefully) 2017-05-08 17:24:46 +02:00
Crazy Lemon
18ffff09f4 Merge pull request #7026 from warior4356/Virtual-Avatars
VR Phase #1
2017-04-18 21:25:35 -07:00
Warior4356
6807b8ba95 Merge remote-tracking branch 'ParadiseSS13/master' into Virtual-Avatars 2017-04-02 02:47:42 -07:00
Warior4356
dbf989be51 Phase one done. 2017-04-02 01:50:51 -07:00
Fox-McCloud
35ab7ada94 Refactors Cell Energy Values 2017-04-01 20:14:29 -04:00
Warior4356
ef9ad52706 Avatar code working 2017-03-20 17:34:40 -07:00
Jovan
7898583968 Change Door Sounds 2017-03-13 06:25:19 -04:00
davipatury
af6db09309 Merge remote-tracking branch 'origin/master' into modular_computers 2017-03-04 15:44:20 -03:00
Crazy Lemon
e6e3ebd462 Merge pull request #6599 from davipatury/datacore-effect
Refactors datacore into a datum
2017-02-26 09:38:56 -08:00
Crazy Lemon
186edb14e7 Merge pull request #6468 from tigercat2000/job_refactor_tg
Ported /tg/'s outfit datums, refactored job controller to support them
2017-02-25 17:54:01 -08:00
davipatury
97b9e17955 Datacore refactor. 2017-02-25 22:31:19 -03:00
Fox McCloud
616a0ff8d1 Merge pull request #6446 from Kyep/terrorspiders-PR3
Terror Spiders 3 - Awaymission & AI
2017-02-25 17:04:30 -05:00
Tigercat2000
fe5fb2c0f8 Merge remote-tracking branch 'upstream/master' into job_refactor_tg 2017-02-25 05:42:47 -08:00
davipatury
9eadc35e35 Comms program. 2017-02-21 12:37:28 -03:00
Fox McCloud
13919abcac Merge pull request #6475 from Krausus/SHUT_IT_DOWN
Adds config options to shut down Dream Daemon instead of rebooting the world
2017-02-18 23:45:32 -05:00
Tigercat2000
14ba6fded6 Ported /tg/'s outfit datums, refactored job controller to support them
Players:
 - The only thing that you should notice is that your backpack options
 have changed. Instead of being "None", "Backpack", "Satchel", and
 "Satchel Alt", there are 6 options:
   - "Grey Backpack": Ensures you always recieve a plain grey backpack.
   - "Grey Satchel": Same as the above, grey, plain, satchel.
   - "Grey Dufflebag": So you don't have to rush the locker room, I
   guess. Just kinda ransacked it from /tg/. Happy to revert it, please
   do not post a five paragraph text wall calling me a shitlord
   powergaming hitler-loving furry.
   - "Leather Satchel": It's a leather satchel. What the hell did you
   think it was?
   - "Department Backpack": Gives you the department's default backpack.
   Grey for most jobs.
   - "Department Satchel": It gives you the department's default
   satchel; A grey satchel if the department doesn't have one.

Coders:
 - The above means this needs a minor SQL change:
   ```
   SQL goes here
   I'll write a query later
   Can't be bothered now
   Kill me please
   ```

 - This is a cleaner method of handling job equipment than
 "M.equip_or_collect" x 1000. Jobs specify a '/datum/outfit' datum,
 which defines all of the things to equip to the user.

 - Minor note: equip_or_collect will no longer ever generate a plastic
 bag. It will instead just drop stuff on the floor if it can't stuff it
 into a mob. If this is even slightly a point of contention, more than
 happy to revert it; It was just requested by Fox.
   - Addendum: This also has the effect of making it so that labcoats
   are just thrown onto the floor if you have a loadout suit. It's not
   really avoidable. Uniforms and suits are equipped before the
   backpack.

 - Changes from /tg/:
   - Changed all of the "H.equip_to_slot_or_del" calls into invoking a
   new "equip_item" proc; This is used to support a new variable called
   "collect_not_del". Job outfits use this, it makes it so that the
   system calls equip_or_collect instead of equip_to_slot_or_del. The
   idea being that job items should never be lost to the void,
   especially because they can conflict with loadout items.

TODO:
 - Retrofit "Equip Mob" verb to use this for all of the non-job options
 - Fully implement head announcements(?)
   - May be best for a second PR that addresses all of the real issues
   with our current job system

( Now go reread that SQL code block :) )
2017-02-17 11:35:45 -08:00
Krausus
366361b7d7 Makes end-of-round sounds play before reboot
Based on their length, they will now start playing early enough to
finish playing right as the server reboots, so long as there's time to
do so.
2017-02-17 12:33:45 -05:00
Mark van Alphen
dea264faf2 Merge branch 'master' into stationgoals 2017-02-17 18:05:15 +01:00
Krausus
a4ab111354 Adds shutdown-instead-of-reboot config options
These basically exist so we can set the server up to automatically kill
itself instead of rebooting.
2017-02-17 01:33:06 -05:00
Kyep
7c6d08b4bf PR 3, you are go for launch 2017-02-14 00:59:17 -08:00
Markolie
4d857de148 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals
# Conflicts:
#	icons/effects/beam.dmi
2017-02-11 18:26:06 +01:00
Kyep
9f20cb1685 Fixes merge conflict in event_container 2017-02-10 22:07:05 -08:00
KasparoVy
ef5376ede2 conflict resolution 2017-02-05 17:13:34 -05:00
Markolie
f2497afd9d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals
# Conflicts:
#	_maps/map_files/cyberiad/z2.dmm
#	code/__DEFINES/is_helpers.dm
#	code/__DEFINES/misc.dm
#	code/_globalvars/lists/objects.dm
#	code/modules/mob/living/living_defines.dm
#	icons/effects/beam.dmi
2017-02-05 20:12:51 +01:00
Fox-McCloud
390f6768b3 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-02-05 05:26:46 -05:00
KasparoVy
c16f734a6d Changes Colourblindness from a Preference to a Disability
For Vulpkanin and Tajara, it gives them their species-specific
colourblindness but their excellent darksight, too. Otherwise it gives
noir vision.

You can choose this disability at character creation. It is off by
default. You can turn it off via genetics and mutadone.

Fixes Cling Transform&Lesser/Greater form & Darksight bugs

Transforming to an identity will now, with 100% reliability, give you
the exact appearance as that ability bar the body_accessory and the
secondary hair/facial hair colours. Same thing with going from lesser
form to an identity that was not the one you lesser formed with.

Fixes the darksight bug from the last commit, happened 'cause typo.
Woops.

Eye Transplantation Applies Eye-dependent Genes

Transplanting colourblind Vulpkanin/Tajara eyes into a Human gives the Human
the dark_view and unique colourblindness of said Vulpkanin eyes.

Removing colourblind eyes will take the disability with it, meaning the
person will have colour vision/low darksight.
2017-01-25 23:10:22 -05:00
Markolie
a06c997629 Add Station Goals
Still to-do:
* Remove old BSA computer.
* Add NanoUI interfaces for all goals.
* Test it.
2017-01-23 22:02:29 +01:00
Fox-McCloud
7007f6bbdf Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-23 01:01:09 -05:00
Fox-McCloud
ea76990b7a Botany Rework 2017-01-21 18:28:03 -05:00
Markolie
a50a3d59b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi
2017-01-20 23:43:35 +01:00
Crazy Lemon
2a209f62cd Merge pull request #5814 from Markolie/ann2
Announcement refactor
2017-01-18 19:17:30 -08:00
Markolie
f85e8fe551 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station.dm
#	icons/mob/screen_alert.dmi
2017-01-11 23:11:29 +01:00
uraniummeltdown
f35f52b89a added mime names from TG, mimes can now pick name on entry 2017-01-08 15:45:14 +04:00
Kyep
e5ab12acd0 PR 2 Creation 2017-01-07 00:18:43 -08:00
Markolie
f4c4bfe288 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__HELPERS/unsorted.dm
#	code/_globalvars/lists/objects.dm
#	code/controllers/verbs.dm
#	code/game/gamemodes/cult/ritual.dm
#	code/game/gamemodes/cult/runes.dm
#	code/game/objects/items/stacks/sheets/sheet_types.dm
#	code/modules/mob/spirit/mask/mask.dm
#	code/modules/mob/spirit/viewpoint.dm
#	icons/effects/96x96.dmi
#	icons/effects/effects.dmi
#	icons/mob/actions.dmi
#	icons/obj/weapons.dmi
#	icons/obj/wizard.dmi
#	icons/turf/floors.dmi
2017-01-06 16:36:46 +01:00
Markolie
1f243ec4f0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
# Conflicts:
#	code/_globalvars/lists/objects.dm
2016-12-31 17:54:06 +01:00
FalseIncarnate
da421d841c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pogo 2016-12-29 21:13:00 -05:00
Markolie
8609157751 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
#	code/_globalvars/mapping.dm
#	code/game/objects/effects/landmarks.dm
2016-12-30 00:17:56 +01:00
Markolie
01f2c85347 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/game/dna/genes/goon_powers.dm
#	code/game/dna/genes/vg_powers.dm
#	code/game/objects/effects/overlays.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/statue.dm
#	code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
#	icons/mob/back.dmi
#	icons/obj/storage.dmi
2016-12-23 19:32:19 +01:00
Aurorablade
2dc1a48f35 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-12-01 22:38:35 -05:00
Markolie
f63a9c279c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
# Conflicts:
#	code/defines/procs/announce.dm
#	code/modules/events/mass_hallucination.dm
2016-10-31 14:46:58 +01:00
Markolie
f27f72e61b ERT fixes 2016-10-26 03:05:51 +02:00
Markolie
61daab92f2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/modules/mob/living/carbon/human/appearance.dm
2016-10-25 18:31:39 +02:00
Markolie
b3f505175e Announcement refactor 2016-10-24 22:03:18 +02:00
Markolie
2e711d1337 Lay groundwork for megafauna, and add Ashdragon.
Includes a refactor for gun turrets (merged into portable turrets), hostile simple_animal behaviour, spells (sounds have been added) and poi_list items.
2016-10-23 23:15:57 +02:00