Commit Graph

12346 Commits

Author SHA1 Message Date
WrongEnd
73a10d20e2 Adds pranks, jukes, and anal retentive bolt action rifles (#3664) 2017-11-10 23:53:01 -06:00
Alberyk
629da0f9c5 Allows species with strong claws to pry open closed airlocks (#3715) 2017-11-10 23:32:04 -06:00
Lohikar
c1e0952a4f Add support for non-genetic markings (#3643)
Adds support for non-genetic markings which are not embedded into DNA.
2017-11-08 21:26:44 -06:00
Synnono
a0d588ba1c Bar Update 2: Electric Boozealoo (#3795)
* Added 13 drinks, mostly cocktails. Added lemon juice in carton format. Added Lemon juice, boukha and fireball to the booze-o-mat.

* More drinks, fixed the Old Fashioned a la Incog, tweaked a few of my recipes.

* Added drinks, added brownstar to the soft drink dispenser, modified descriptions.

* Finished adding drinks, tested all recipes, adjusted reaction values.
More testing to follow

* Renamed fireball, recipe tweaking/testing. Added sprite for metropolitan.

* Testing, spelling pass, adjusted some erroneous tastes or descriptions on other drinks.

* Changelog meme

* White wine. Last minute.

* formatting in description text

* Instances of wwine changed to whitewine.

* Typos
2017-11-05 22:44:28 +01:00
Ron
bf77cbe426 Bug fixes (#3807)
Fixes #3770
Fixes #3802
Resolves #3682 (stop all sounds verb)
Fixes #3804
Fixes #3789
Fixes #3558
Fixes #3549
Resolves #3745
2017-11-05 16:20:51 +02:00
Alberyk
36b6642c83 Fixes merchants making a lot of money with little effort (#3815)
This should fix merchants getting insane ammounts of credits due to plasma.

Also, fix an issue with a vampire message check.
2017-11-05 12:50:45 +02:00
chaoko99
9514cfeea1 Prevents us from being sued by the red cross. (#3794) 2017-11-03 11:45:50 +02:00
Alberyk
d3b34d1e47 Fixes some sprites issues (#3784)
Fixes #3783
Fixes #3537
Fixes #3771
2017-10-30 14:00:21 +02:00
Erki
7b1bcdc8f3 October Bugfix Bonanza (#3767)
Fixes #3742 - someone unfucked the fix again.
Resolves #3740 and resolves #3739.
Fixes #1558 - a 10 month long meme is dead.
Resolves #3720 by making robo-eyes immune only to the eye stinging effects of pepperspray. Let there be equality amongst the synths.
Fixes #3676 - tested, shouldn't break. It was double-calling set_death_timer.
Fixes #3672 and fixes #3658 - that was my bad on not noticing the diff around hologram.icon = icon vs add_overlay(icon).
Fixes #3762 - I'm surprised this didn't fuck over more.
2017-10-29 19:03:24 +02:00
skull132
c0f22a1cdd Merge branch 'master' into development
# Conflicts:
#	maps/aurora/aurora-1_centcomm.dmm
2017-10-29 16:15:53 +02:00
Alberyk
2d52377ad8 Fixes the merchant job showing up in the id's console (#3737) 2017-10-29 13:17:07 +02:00
Alberyk
b680aa1fb5 Borg and dionae vines fixes (#3758)
Fixes emmaged borgs being locked down by the robotics console.
Also, fixes a dionae structure being dense, turnings dionae mazes into a pain to use.
2017-10-27 22:56:36 +03:00
Alberyk
a057155ad8 Fixes blood heal not fixing broken bones or internal bleeding (#3738)
Now it should heal any wound.
2017-10-25 06:30:50 +03:00
osiato
a0e801d5c7 Fixes Aurora3 issue 3498, which was a typo with the text when nanopaste is self used by an IPC and observed by another person. (#3504)
Which was a typo with the text when nanopaste is self used by an IPC and observed by another person.

There were 2 issues,
There was no space after a terniary function, causing a grammatical error.
Another grammatical error was caused due to the else block of the terniary function being defined as " \the", which was processing as \t he (tab he) and causing results such as he Hephaetus instead of the Hephaetus.

fixes #3498
2017-10-23 16:10:14 +03:00
Lohikar
fc78e49b14 Fix AO being broken on ChangeTurf() (#3732)
Fix AO being broken on ChangeTurf()
2017-10-22 17:53:39 +03:00
TheGreatJorge
c724dd35ad Map-fixes (#3726)
Fixes #3690
Changed blast door orientation on many blast doors across the station, and one few in CC as well, provided picture is only example. Changed blast doors are in areas: Bridge, Cap office, Research, Security, Engine, CC departures. That should be it, I think.
Fixes #3716
Fixes #3708
Fixes #3706
Fixes #3704
Fixes #2937
Also reversed APC sprites on sideways directions.
Fixes #3725
Fixes #3723
Fixes #3457
Fixes #3159
Fixes #3140
2017-10-22 02:39:31 +03:00
Ron
0d0117dcff Fixes some runtimes (#3727) 2017-10-22 02:37:44 +03:00
Alberyk
a155680d73 Stun talisman and manifest rune fixes (#3729)
-fixes stun papers not working
-fixes manifest runes not working properly
-adds the non embed to manifest ghosts
-fixes more belt_mirror wrong icons
2017-10-22 02:37:07 +03:00
Lohikar
383dd055e7 Merge branch 'master' into development 2017-10-20 13:30:03 -05:00
Lohikar
5a888996b8 Convert some duplicate code to a macro (#3623)
Shouldn't change behavior, just reduces amount of copypaste code.
2017-10-20 19:13:43 +03:00
Lohikar
b05932127f Sound Tweaks (#3627)
changes:

playsound now reuses sound datums instead of creating a new one for each mob.
Footsteps no longer use an in list (...)
Modular computers now beep occasionally (if your client's Ambience pref is on)
Sounds from Bay.
2017-10-20 17:53:44 +03:00
Alberyk
ff67db51c9 Fixes messed up belt_mirror sprites, bag missing sprite and merchant mecha weapons (#3712)
-fixes #3707
-fixes #3711
-fixes the science courier bag having no sprite
-fixes a lot of items being brown by accident
2017-10-20 14:18:39 +03:00
Lohikar
61b5203d24 Runtime Map Loading (#3597)
changes:

Maps are no longer compiled in, instead loaded directly from the DMMs at runtime.
Z level defines have been moved from the config to map datums.
Unit tests now use typecaches.
DMMS now actually works.
DMMS has been updated slightly.
DMMS is now capable of loading simple lists of non-text types.
DMMS is now faster when loading many types without mapped in attributes and when loading area instances.
Asteroid generation is now defined on the map datum instead of being hard-coded in SSasteroid.
Holodeck presets are now defined on the map datum.
Atmos machinery now uses Initialize().
2017-10-18 23:07:34 +03:00
Lohikar
0f35cf09d7 Add lunchboxes to dinnerware vendor (#3640) 2017-10-18 12:23:03 -05:00
AgentWhatever
58b9ab85a0 Computer sprites (#3622)
Constructing a computer now makes sense sprite-wise.
Also edited some fluff text to be more accurate during construction.
2017-10-18 12:20:45 -05:00
Alberyk
09c2824a73 Fix this bug, again (#3697)
What the title says.
2017-10-18 19:18:26 +03:00
Erki
6c47fb889a Revert #3241 (#3670) 2017-10-17 20:39:50 -05:00
Alberyk
bd3120eace Fix merchants spawning without their gear when joining late (#3689)
If a merchant character has cryo as their spawn point and join late, they do not get their gear, this should fix said issue. And also fixes all access ids not getting merchant access.
2017-10-17 21:50:56 +03:00
Alberyk
86f8fbef49 Icecream final fix, more whitelist attempt and missing lights sprites (#3678)
-fixes icecream once for all
-might fix xenos whitelist loadout
-fixes #3675 and #3654
-fixes #3684
-fixes #3686
-fixes #2747
2017-10-16 23:38:55 +03:00
Zuhayr
30d92571cf Nymph head flowers. (#3634)
Adds a head flower to 5% of diona nymphs.
Also changes get_random_colour() to return a proper RGB string instead of expecting the caller to add the #.
2017-10-16 11:47:45 -05:00
Alberyk
9696c7dd83 Bugfixes: xeno loadout, vox mirror and worm crash (#3663)
-might fix #3660
- Fixes #3666
-fixes some issues with the mirror
-fixes worms crashing the server
-might fix ringers
2017-10-15 21:04:16 +03:00
Ron
523a7609c3 Fixes holocalls (#3661)
Fixes #3656
2017-10-15 18:43:55 +03:00
skull132
2dc308a9c2 Merge branch 'master' into development 2017-10-14 22:35:17 +03:00
Erki
1e577426ae Fixes #3534 (#3649) 2017-10-14 22:34:16 +03:00
Lohikar
f110b123cc Dynamic CC Lighting (#3619)
Changes the Centcomm areas to use dynamic lighting and maps in lights so that CC isn't pitch-black.
2017-10-14 20:06:08 +03:00
Lohikar
5aa2a1852a Fix an error in DMMS (#3604)
Fixes a mistake in /atom/New() that breaks DMMS loading & has a minor performance impact.
2017-10-14 20:04:11 +03:00
Alberyk
61f705a8b1 Mecha equipment changes and tweaks (#3610)
-adds a desc to all mecha gear that were missing them
-moves the cable layer to tools.dm from medical_tools.
-fixes relative pathing in some mecha equipment files
-adds a mecha plasma cutter, that can be used by ripleys, and a incendiary gun for combat exosuits
-the scattershot weapon should fire pellets now
2017-10-14 19:35:45 +03:00
Lohikar
146726ffcf Fix AO not initializing on mine turfs (#3639)
Fixes #3638.
2017-10-14 19:32:33 +03:00
Ron
36e8ba16a6 Teleportation scroll change (#3617)
The teleportation scroll will no longer teleport people onto open spaces.
Closes #3602
2017-10-14 19:25:43 +03:00
Alberyk
e7eec867bc Cargo random stock and some fixes (#3609)
-tweaks cargo random stock a bit, and removes the borg chassis that caused a lot of bugs
-fixed a wrong name in some food trash type
-fixed the slime stunbaton having no in hand sprite
2017-10-13 17:38:33 +03:00
Alberyk
deaddd90b4 Makes rev great again (#3605)
* Makes rev great again

* changelong
2017-10-12 19:55:59 +02:00
Alberyk
2e9d2cc72d Fixes two ais spawning during paranoia (#3635) 2017-10-12 00:35:30 -05:00
Alberyk
15a391f209 Vox changes and additions (#3585) 2017-10-10 18:53:00 -05:00
TheGreatJorge
0aff2d8785 Coloured lighting & related stuff (#3555)
Makes all light tubes & bulbs have colour according to the light they emit. There are 6 preset colours: RGB CMY. Any other color is possible by simply changing the already present brightness_color variable. This PR makes it so it actually changes the color of the item and wall object too.
    Added two new colour defines used only along with preset coloured lights.
    Coloured lights are only obtainable by random maintenace loot, cargo spawn or trader.
    Added box of randomly mixed light colours and box for every preset light colour.
    Removed two sets of redundant defines.
    Converted light item New() to Initialize() (hopefully correctly).
    Made couple tiny tweaks to the lights code.

EDIT, 7. Oct 2017:

    When you hit light machinery or item with paint, it will change it's brightness_color var, instead of the color var.
    Paint buckets can now paint items and people again.
    You can now wash paint off by spraying yourself with fire extinguisher or otherwise covering yourself in water.

EDIT, 8. Oct 2017:

    Removed one apparently unused global list.
    Converted pain bucket New to Initialize and changed it's pathing style.
    Shower can now wash paint too.
    Fixed paint bucket sprites to be bit more dynamic and fixed the in hand sprite. Also added bucket lid.
2017-10-10 18:46:24 +02:00
chaoko99
d217c638c4 Adds, maps slime core bag. (#3584) 2017-10-08 23:50:34 -05:00
chaoko99
4cdcd9e20f Butterfly knives are now properly placed in hands when created (#3578) 2017-10-08 22:39:25 -05:00
Alberyk
a53ccd1453 Changes default occupation's preference to return to lobby (#3570)
This will reduce the ammount of people getting jobs they do not want and then having to cryo/ask admins for a respawn.
Fixes #3571
2017-10-07 20:32:18 +02:00
Werner
baa9c475c1 Merge branch 'upstream-master' into development-upstream
# Conflicts:
#	code/modules/reagents/reagent_containers/food/snacks.dm
2017-10-07 15:13:33 +02:00
Alberyk
01990fb1e8 Adds the sarlaccs and some golden slime fixes (#3533)
-adds the sarlaccs from fowl's old mining pr, to be used in an event and for general adminbus/maybe in the mining mob's future pr
-blacklist some mobs from spawning via the golden slime
2017-10-07 13:15:34 +03:00
Alberyk
094c057386 Xenomorphs fixes and improvements (#3548)
This pr makes xenomorphs less awful via some additions and porting some fixes:
-removes the NO_MINOR_CUT that is not used anywhere and replace with NO_EMBED that stops things from embedding into mobs, like xenomorphs, shadow people and golems
-adds the night vision verbs to xenomorphs
-fixes aliens eggs layers behind under their weeds
-fixes some hud things missing
-makes their limbs unbreakable

This should make them a bit less buggy.
2017-10-07 13:10:18 +03:00