Commit Graph

23590 Commits

Author SHA1 Message Date
skull132
ff44b44e14 Merge branch 'master' into development 2017-08-07 23:56:04 +03:00
Alberyk
0e5d79c13f Fixes some boxes starting with the wrong contents and more (#3247)
-fixes #3226
-fixes zipties boxes
-fixes the mounted pulse module using the wrong gun
-fixes ballistic guns icons showing as empty when the round starts
-tweaks the uplink vest to include the matching helmet
2017-08-07 22:53:43 +03:00
Lohikar
3714736667 Door visual glitch fix (#3251)
Fixes hatches & maint overlays not properly being cleared during the door open animation.

Thanks go to TheGreatJorge for figuring out why this was happening.
2017-08-07 22:53:22 +03:00
Lohikar
a7c2f5c992 Fix devour sanity check (#3250)
Fixes a bug where the devour type check would always return TRUE.
2017-08-07 22:53:03 +03:00
skull132
81bb348a42 Merge branch 'master' into development 2017-08-06 22:09:41 +03:00
Ron
cb5e227320 Converts some istype's to use helpers (#3224)
Converts various istype's to use helpers. Mainly:
Cable
Wrench
Screwdriver
Multitool
Crowbar
Wirecutter

And makes the helpers defines.
2017-08-06 22:08:42 +03:00
Ron
ad96a34dd8 Removes some in worlds (#3227)
Removes some in worlds and some commented out code that I don't think will ever be used.
2017-08-06 19:50:53 +03:00
Werner
1ae15cd900 Cig price change requested by jackboot (#3245)
Cig price change requested by jackboot
2017-08-06 18:31:22 +03:00
Alberyk
d6ee6ac81f Mixed gamemodes changes (#3239)
-changes uprising from cult and rev to rev and traitors
-enable intrigue that was left behind
-updates the config to include all gamemodes
2017-08-05 23:03:25 +03:00
Erki
a50820a574 Fixes a bug with default values. (#3237) 2017-08-05 22:36:14 +03:00
Alberyk
26d92d27f4 Fixes merchant slot being broken (#3235)
I messed up here and did not change the spawn_positions to the correct numbers, this should fix this.
2017-08-05 22:12:19 +03:00
Alberyk
85c0c763df Fixes throat slitting being broken (#3232)
-fixes being unable to slit people's throat
-fixes the sprite of make's custom item being wrong
-fixes the infestation event using the incinerator area, something that don't seems to exist anymore, it is replaced with the waste disposal now
2017-08-05 21:04:18 +03:00
Lohikar
20150cd113 Devour fixes (#3231)
Bunch of fixes and balance tweaks to the devour system. Notable changes are that xenomorphs can eat people again and that human-types no longer take ridiculous amounts of damage from devour.

changes:

Devour type checks now actually operate on species for human-types and are all-around hopefully more sane.
Replaced an obsolete define with a boolean.
Fixed xenomorphs being unable to swallow human-types.
Rebalanced digestion damage to not kill human-types in one tick.
Digestion now deals fire+brute instead of cloneloss (bite still deals cloneloss as I didn't touch its damage function)
Misc code tweaks.
2017-08-05 21:03:49 +03:00
Pacmandevil
6a6124ca82 Mouse tweaks. (#3228)
Adds a shared cooldown to Mice squeaking, soft squeaking, and squealing. no more will we have to endure squeak spam

Tweaks mouse-traps to do 8-14 halloss damage instead of brute. They still do brute, but only 1-3. this'll make giant mouse-trap piles in maint less of a meme.
2017-08-05 21:02:42 +03:00
skull132
56ac9238cd Merge branch 'master' into development 2017-08-04 22:19:20 +03:00
Alberyk
193e15c224 Fixes ai core airlock, lack of bluespace crystals and a bit more (#3225)
-fixes #3218
-fixes #3213
Fixes a messed up table at telescience
Fixes a wrong cable at engineering
Fixes a broken uplink item
Fixes a wrong named camera
Changes the location of the heister and merc shuttles in the under station z level to be near the engine pipe area
2017-08-04 22:18:25 +03:00
skull132
1784bf4669 Merge branch 'master' into development
# Conflicts:
#	maps/aurora/aurora-3_sublevel.dmm
2017-08-04 22:10:58 +03:00
Lohikar
32a33d9d7c Lift light tweaks (#3223)
changes:

Lifts no longer automatically generate lights if they're set to not clear the shaft.
Mapped in lifts now have mapped in small lights, only in the lift cabin.
2017-08-04 21:49:56 +03:00
Alberyk
b4fa4a8b3a Baystation12 merchant port (#3155)
Port of the merchant mechanics from baystation12.
All of the trader, prices and most essential system are done, as well the job datum and the like. Mapping the shuttle, the base and a new dock will be done in a later pr.
Also adds phazon construction and several other items used in this pr.
The chance of the merchant slow being open at round start can be changed via the config, it is 20% by default.
2017-08-04 21:36:04 +03:00
Lohikar
880d9cb5b4 Fix MC crash handling (#3222)
Ports a fix from /tg/ upstream - previously failure strikes did not distinguish between subsystems when they should've.
2017-08-04 21:24:41 +03:00
Alberyk
de046a95b7 Custom items 03/08 (#3220)
Adds the following items:
Ceramic Teapot - Sean Brianne - zelmana
Workers Flask - Nasser Antonov - sonicgotnuked
Tan Engineering Beret - M.A.K.E - toasterstrudes
Antenna - M.A.K.E - toasterstrudes
Vaporizer Pen - Nathan Corvo - jkjudgex

Also, some changes code and path changes on certain items.
2017-08-04 21:24:04 +03:00
Erki
7b3b8fb419 :ree:verts genetics (#3219) 2017-08-03 23:25:56 +03:00
skull132
0f072e15e9 Merge branch 'master' into development 2017-08-02 23:56:29 +03:00
Lohikar
1545ba469e Orbit Fixes (#3207)
changes:

Fixed an issue where the segment count argument of orbit() was ignored, leading to the Tesla not animating as it was intended to.
Fixed an issue where /datum/event had two completely unrelated definitions (fixes #3192).
2017-08-02 19:55:53 +03:00
Lohikar
69c4658d70 Fix tesla coils (#3208)
Fixes tesla coils not properly connecting to the powernet on anchor.
2017-08-02 19:55:12 +03:00
Lohikar
3167294ab1 Improved directional lighting fallback when facing opaque objects (#3210)
Facing an opaque object with a directional light source will now temporarily change the light to LIGHT_OMNI and halve the range instead of slightly tweaking where the light cone is drawn.
2017-08-02 19:54:10 +03:00
Lohikar
1ee2203b01 clean up some legacy code (#3211)
changes:

/obj/effect/list_container/mobl has been replaced with /datum/mobl.
/obj/effect/stop has been removed as it is unused.
/obj/effect/shut_controller has been removed as it is unused.
Uristrunes now cache in SSicon_cache.
2017-08-02 19:53:23 +03:00
SoundScopes
b0e8170f78 Adjusts ChemMaster's layer (#3212)
It's a fix #3196 for some reason git didn't link the pr with the issue
2017-08-02 19:52:59 +03:00
Lohikar
7f56cdab38 Guest ID Expiry Icon (#3189)
Guest ID cards' icons will now change when they expire.
2017-08-02 19:49:42 +03:00
Ron
0a760075ee Adds the gravity generator (#3183)
Works like it did in old code with some minor additions. The sprite is the one TG uses.
2017-08-02 19:48:54 +03:00
Alberyk
cbc45b3b26 Cult improvements (#3143)
-removes the need for word research
-allows nullrods to shatter pylons on hit, to disable forcewalls, close gateways, and turn cult swords in less powerful claymores
-allows ghosts to flicks lights if the round is spooky enough
-renames some cult items
-converts ritual.dm and rune.dm into proper pathing and remove some in world from it
-adds a machine that allows people around it to see ghosts, with some side effects
-manifested ghosts don't count for nar'sie summoning anymore
-manifested ghosts do not use the dummy type anymore, they are their own species with a similar behavior
-visible ghosts can now whisper to people and move small objects around
-fixes #3145
2017-08-02 19:40:03 +03:00
Alberyk
1319ae8a2e Probably fixes most of the issue related with dropping/throwing off hand items. (#3199)
Fixes #3172
Fixes #1110
2017-08-01 08:17:29 +03:00
skull132
fd7aea8901 Merge branch 'master' into development 2017-07-31 21:58:50 +03:00
Alberyk
868d4d37bf Fixes some things (#3197)
Fixes #3195
Fixes #3194 by reducing a bit the mining pickaxes damage and the kinetic accelerator damage
Allows fitness machines to drain a bit of nutrition as you use them
Fixes one of the syndicate cyborgs sprites having a rogue pixel somewhere
Fixes some barsigns not having icons for all directions
Brings back the illegal guns crate to cargo due to massive popular request
2017-07-31 21:56:48 +03:00
Lohikar
2fb9387988 More Openturf fixes (#3198)
Fixes a bug where openturf would unexpectedly delete an overlay if it was updated via. update_above() when it was already queued for update. Also fixes #3191 and includes some minor performance optimizations.
2017-07-31 21:49:51 +03:00
Lohikar
a6a9a6ab7b Fix Autodrobes again (#3190)
changes:

Autodrobes no longer steal your clothes if you had an oversuit on but not a custom jumpsuit.
Late Miscellaneous Init (LMI) no longer uses silent init logging.
equip_to_slot_or_del() will now equip even if the target slot would normally be inaccessible.
May fix #2826.
Fixes #2512.
2017-07-31 21:49:23 +03:00
Lohikar
bf43f94801 Fix instance counter (#3188) 2017-07-31 21:48:49 +03:00
Lohikar
523b203273 Faster (?) Garbage SS (#3184)
changes:

The GC now truncates its lists using a single Cut() call per run instead of one cut call per item removed.
Nar-sie and Supermatter Cascades now disable the GC to reduce lag during these events - round is ending in 5 minutes anyways, so enforcing deletes is not important.
Garbage's MC status panel now displays how many objects are awaiting queueing.
2017-07-31 20:26:28 +03:00
Lohikar
36164a15d4 Better action progress bars (#3175)
changes:

Progress bars will now stack if there is multiple ones on a single turf.
Progress bars' update speed is now mediated by stoplag() instead of arbitrary numticks numbers.
A callback can now be passed to do_after or do_mob which will be called every check - if the callback returns FALSE, the action is cancelled.
Progress bars no longer show an X briefly when their associated action is cancelled.
Progress bar itself is from /tg/, do_after changes are not.
2017-07-31 20:23:47 +03:00
Lohikar
63df52956b Add openturf icon (#3181)
Adds a mapping-time icon for openturf to make mappers' lives a little easier when working with them.

No player visible changes.
2017-07-31 20:23:17 +03:00
Wraithcraft
219ce42ac8 Cocktails patch (#3167)
Adds Champagne, Bitters, Mint Syrup and 11 different cocktails. All of the spritework is awful. I'm sorry about that.

Cocktails: Champagne Mojito, The Classic, Cork Popper, French 75, Muscovite Mule, Orange Mimosa, Pink Gin, Pink Gin and Tonic, Pirate Punch, Planters Punch and Southside Royale.
2017-07-29 00:38:39 +03:00
MarinaGryphon
a7f7cfe523 Fixed an issue with coffee beans from Cargo. (#3154)
Fixes #3152
2017-07-28 21:12:19 +03:00
Lohikar
f8cdcd013c More initialize tweaks (#2971)
changes:

Organs now use Initialize().
The observe message now shows the configured respawn delay instead of always 30 minutes.
Seed datums no longer have a timer in New().
External organs no longer have a timer in New()/Initialize()
Converted some spawns in organs to timers.
Floor init no longer breaks to plating first for mapped in tiles.
Added the INITIALIZE_IMMEDIATE macro to make Initialize() not wait for SSatoms init.
Mannequins now use INITIALIZE_IMMEDIATE instead of a custom-defined New().
Mannequins (from get_mannequin) now delete themselves if unused for 5 minutes or longer.
2017-07-28 12:00:36 +03:00
Alberyk
67addca62b Improvised shotgun, double internal boxes and map fixes (#3171)
-fixes some issues with sawing off the ghetto shotgun
-adds cargo access to the maint leading to the elevator, to stop people from breaking so easily into cargo
-Fixes #3169
-Fixes #3158
-Fixes #3157
-Fixes #3147
-Fixes #3148
2017-07-27 21:33:16 +03:00
Lohikar
7e067bb780 Fix airlock construction (#3153)
changes:

Fixed a runtime in airlock/Initialize() that resulted from req_access or req_one_access being null. (Fixes #2802)
Minor airlock/Initialize() efficiency tweaks.
2017-07-27 18:11:32 +03:00
Lohikar
cfb7357c6f Area cleanup, Minor BST tweaks, Nuke Fixes, Explosion fixes (#3164)
changes:

Ported some timer fixes from /tg/ (timerid overflow fix, invalid deltimer logging)
Removed pointless air alarm elections.
Cleaned up some area code and moved area var definitions into areas.dm.
The nuke now only destroys Zs connected to the Z it detonates on. (Fixes #2552)
The nuke no longer destroys CC.
Nukes now dust mobs.
Cascades now dust all mobs on all non-admin levels.
Fixed a bug where SSexplosives would not honor the is_rec var.
Improved the efficiency of /proc/random_station_area().
Bluespace Bugs can now teleport out again.
Bluespace Technicians can now turn off their x-ray vision without needing to remove their glasses.
Human-types no longer make footstep sounds when lying down, unconscious, or dead.
2017-07-27 18:10:38 +03:00
MarinaGryphon
4c920dc52e Various coffee (and coffee maker) changes and fixes. (#3149)
Lets Cargo order coffee beans and a coffee maker, under Hospitality. The bridge, which is the only place that has a coffee maker, only has 100 units of black coffee and no way to replenish it. Most people don't even know about the hidden types of coffee, and I might add more in the future, so I wanted it to be more accessible.

Additionally, I made the two types of coffee actually able to be made.
2017-07-25 20:49:47 +03:00
Alberyk
f847615a79 More bug fixes: vending machine, scout rifle sprite and missing disposals (#3146)
Fixes #3113
Fixes #3117
Fixes #3112
Fixes a light being on the way of the lift's airlock at cargo
Fixes the scout rifle not having a wielded sprite in hands
Adds hop access to the pda and cartride vending machine
Move ambrosia in the seed vendedor to the contraband list
2017-07-24 14:16:49 +03:00
Lohikar
c1b27cab0b Fix sideways ghosts (#3142)
Fixes #3141.
2017-07-24 08:28:03 +03:00
Lohikar
e06fa3c795 Minor Initialize fixes (#3138)
changes:

Fixed some missing hints for gibspawners and spiders.
Removed all duplicated lattices/catwalks from the map.
2017-07-23 12:41:23 +03:00