Commit Graph

6047 Commits

Author SHA1 Message Date
Alberyk
ebc9b81ee1 Adds more loadout options, underwear options and increases the loadout limit points (#3943)
-adds towels, which you can find at the fitness room, or at the loadout with whatever color you want
-adds new undershirt options at people's requests
-adds a colorable sweater to the loadout, from baystation
-adds more flower hairpin options
-increases the max loadout points by five
-fix an issue with the tactical armor having the holster overlay when it should not
2017-12-17 11:18:50 +02:00
LordFowl
f8daffdcfa Tidies up Mine Drones and Gifts (#3930) 2017-12-13 17:14:48 -06:00
Alberyk
1fc6291d46 Return of the facehuggers (#3883) 2017-12-12 13:46:44 -06:00
LordFowl
2ac73351b8 Unapologetic Vaurca Buffs (#3949) 2017-12-12 13:15:45 -06:00
Mykhailo Bykhovtsev
c1452cf3c6 Welder damage protection (#3972)
BST sunglasses now have full welder damage protection

GODMODE now also gives welder damage protection.
2017-12-10 22:06:30 +02:00
Lohikar
cd910c072c Asteroid tweaks (#3951)
changes:

Z-levels below the surface now use 'rocky' ash instead of ash turfs. (Sprites from TG)
Fixed an issue where openturfs would incorrectly inherit their mimiced turf's gender.
Tweaked the names & descriptions of sand (now ash) and rock.
Reduced some pointless locate() calls in icon smoothing code for turf paths.
Replaced the empty space map with runtime Z expansion.
Fixes #2756.
2017-12-10 00:20:35 +02:00
Alberyk
b58a3037c1 Some small fixes and tweaks (#3933) 2017-12-08 17:10:02 -06:00
Werner
5b7d63af57 Computer Stuff (#3932)
This started out as just some stuff for cargo.
Then it grew.

Fixed tablets and laptops not working due to some changes in #3826 that caused some old ballast to haunt us.
Changed the beeping sound of the modular computers to respect the ambience sound preference.
Added a application that can be used to pay and verify that a cargo order has been received
Added a delivery pad to cargo and spawns one in the CTs and QMs lockers.

Further tweaks to tablets and device enrollment in general are incoming, but I dont want to bloat this pr any further.
(I dont like how the company/private device system is implemented right now; It should rather be based upon the hard disk than the device itself)

closes #3931
2017-12-09 00:39:28 +02:00
Lohikar
5e33bd0e2c Misc tweaks (#3916)
changes:

/obj/visual_effect has been repathed to /obj/effect/visual.
Openspace movables will no longer use the space plane when on an openturf mimicing a space turf.
Lights now only update on direction change if your direction actually changed.
Fixed some bad set_dir() procs that were either pointless or that didn't return parent.
Mapped-in or maint dirtier-spawned glowing goo no longer self-deletes after 2 minutes.
Fixed an issue that may have caused some openspace movables to not properly handle direction changes.
2017-12-09 00:36:53 +02:00
skull132
d536d9f4aa Merge branch 'fake-master' into development
# Conflicts:
#	code/ATMOSPHERICS/atmospherics.dm
#	code/defines/procs/announce.dm
#	maps/aurora/aurora-3_sublevel.dmm
2017-12-09 00:08:21 +02:00
TheGreatJorge
9609b37e9a Christmas map additions (#3928)
Fixes #3910
Fixes #3909
Fixes #3781
Fixes #3772
2017-12-08 23:15:46 +02:00
Alberyk
1753d47971 Fixes some issue with items and flesh to stone (#3945)
Casting flesh to stone while someone was grabbing, or with other items in hands, the wizard caused some odd behavior, this pr should fix this by forcing the victim to drop anything they are holding in their hands when the wizard casts this spell.
2017-12-08 23:13:01 +02:00
Werner
94fe548cf7 Should fix #3841 (#3861)
Makes printing announcments a parameter of .Announce() and changes a few announcements to use that.
Should fix #3841
2017-12-08 23:05:52 +02:00
Alberyk
e0ce06ddaf Adds a delay when using nanopaste and more (#3955)
-added a delay when using nanopaste
-nanopaste can't be used through spacesuits anymore
2017-12-08 15:21:37 +01:00
Alberyk
2c38136173 Landmines (#3908)
Adds landmines, objects that can be deployed and will trigger a certain effect when someone walks over them.

Can only be "disarmed" via destroying it, by bullets, explosion and etc.

Sprites made by thegreatjorge.
2017-12-04 18:45:31 -06:00
Mykhailo Bykhovtsev
88267a1a6a Small map, and sprite fixes. Welder fixes (#3887)
Fixed fire alarm in virology #3875

Fixed random pixel on glasses #3872

Fixed welder issue #3888. Plus explored further issue with welder, fixing it. Small logic optimization.

Fixed firelocker icon not being updated with welded overlay, even so they have been welded

Welding interaction with closets was reworked, almost all secure closets except for detective's, barternder's now work with welding same way as closets/crates.

Coffins, and wooden closets of any kind can no longer be welded shut.

Clean up of some code using src as reference, and :
2017-11-30 06:50:55 +02:00
LordFowl
70ef2fb9c5 Flags (#3884)
Adds flags and banners to the custom loadout section. Sprites based off of B12's SolGov flag, which has also been ported.
2017-11-25 18:17:58 -06:00
Lohikar
461ec73b94 Merge branch 'master' into development 2017-11-25 12:57:38 -06:00
Ron
8e0797249e Bug fixes (#3880)
Fixes #3873
Fixes #3874
Fixes #3869
Fixes #3857
2017-11-19 22:57:01 +02:00
Lohikar
58519daeba Recharger QoL Tweaks (#3826)
changes:

Rechargers now briefly show a progress bar showing the current charge level of the device currently charging.
Examining a recharger will now specify what is in the charger.
Atoms can now mark themselves as requiring an icon update on initialize instead of overriding Initialize() just to call update_icon().
Charger code is now slightly more modular, using proc/get_cell() to get a ref to the power cell instead of hard-coded if-else chains for each supported type.
2017-11-18 18:46:14 +02:00
Ron
a17ae9826d Slipping on blood (#3812)
Adds slipping for people who run/walk over blood.
2017-11-16 23:02:32 +01:00
Pacmandevil
86b56478f2 Tweaks some vendors to better use Contraband and premium items. (#3818)
Tweaks some vendors to better use Contraband and premium items
2017-11-16 23:01:39 +01:00
skull132
7dc02be204 Merge branch 'master' into development
# Conflicts:
#	code/controllers/subsystems/initialization/misc_early.dm
#	config/example/config.txt
#	maps/aurora/aurora-1_centcomm.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
2017-11-11 20:57:28 +02: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
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
skull132
c0f22a1cdd Merge branch 'master' into development
# Conflicts:
#	maps/aurora/aurora-1_centcomm.dmm
2017-10-29 16:15:53 +02: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
383dd055e7 Merge branch 'master' into development 2017-10-20 13:30:03 -05: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
Erki
6c47fb889a Revert #3241 (#3670) 2017-10-17 20:39:50 -05: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
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
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
Alberyk
12597e9849 Hardsuit fixes and grenade launcher restrictions (#3536) 2017-10-07 00:45:07 -05:00
Lohikar
8db472ae15 More stats (#3562)
* MORE STATS FOR THE STATS GODS

* save them to the db
2017-10-06 19:39:15 +02:00
Alberyk
8e53ea0c78 Cult and antag fixes/tweaks (#3524) 2017-10-02 22:34:01 -05:00
Alberyk
7d85f2ce12 Fixes pianos (#3511)
-fixes being unable to move pianos
-fixes mechas getting the wrong wreckage icons if destroyed while open
-fixes fried mushroom taste
2017-09-28 08:25:25 +03:00
Ron
95595e45af Bug fixes (#3493, #3428, #3444) (#3494)
Removes some unused code
Fixes #3493
Fixes #3428
Fixes #3444
2017-09-25 10:59:52 +03:00