Commit Graph

89 Commits

Author SHA1 Message Date
PJB3005
8ce6ae2b87 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-08 14:30:23 +01:00
Cyberboss
b86e224571 Makes qdeleted and qdestroying macros (#23666)
* Makes qdeleted and qdestroying macros

* Makes QDELETED and QDESTROYING uppercase

* Swap qdel checks istype's for != null's

* Fix it

* How was this missed?
2017-02-06 00:59:27 +13:00
coiax
608232d288 Soapstones: Leave messages for the future crew (#23176)
* The beginnings of soapstones

* Compilation

* Sprites!

* White text

* Persistence

* More tweaks

* Why isn't it working

* Removes author name

* Random names, more checking for nulls

* VARIABLE MESSAGES

* Fixes icon conflicts

* Limited soapstone uses, purchase more at cargo

* No carving if empty
2017-01-28 17:48:55 +01:00
PJB3005
7356e80484 hey that should be everything except making it compile. 2017-01-17 22:08:27 +01:00
kevinz000
646bb99b99 Lessens spray can spam (#22970)
* Update crayons.dm

* Update crayons.dm
2017-01-14 11:55:35 +13:00
Cyberboss
6e622eedd1 Moves reagents into atoms 2017-01-08 23:02:37 -05:00
Mervill
422d869a40 [s] Fixes spraycans being silent (#22682)
* The regular spraycan makes noise again, also spraying someone in the face is loud

* There are more then 80 columns in the world today, friends
2017-01-04 19:42:39 +13:00
Shadowlight213
5dd264102e Adds arrival shuttle to radstorm protected areas
Fixes spider structures having null armor
Fixes division by 0 with hellcan
Fixes runtime in automatons
Fixes runtime with recharger in modular computer destroy
Fixes runtime in power monitor
2016-12-23 18:50:10 -08:00
Mervill
09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
phil235
029bc65b93 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/atoms.dm
#	code/game/gamemodes/nuclear/nuclearbomb.dm
2016-10-19 01:56:02 +02:00
phil235
240f3a4c49 Adding var/list/atom_colours to /atom .
The var will be used to store the various coloring that happen for the atom so that we can separate paint coloring from color that must be inherent to the atom (an initial color for example), or from certain coloring effect like revenant's blight, mob electrocution's black color, admin edit of the color var, green color from holding the greentext item, etc.
The list has four elements, used for four categories:
ADMIN_COLOUR_PRIORITY for admin varedits and very rate color effect like holding the greentext item (and other effects that should prime over any other potential source of coloring even temporary effects).
TEMPORARY_COLOUR_PRIORITY for short color effects like revenant blight on mob, mob electrocution making you all black for a couple seconds, effects that should be appearing above paint coloring.
WASHABLE_COLOUR_PRIORITY for pretty much all paint coloring like colorful reagent on mobs, coloring turfs with paint, etc.
FIXED_COLOUR_PRIORITY for color inherent to the atom, like a blob's color, any object with a color value given in its definition.

Fixes electocution animation on mob not making the mob all black (with the skeleton overlay blinking over it)
Spray cleaner and soap can now wash paint off mobs, turfs and objects.
2016-10-19 01:51:30 +02:00
Joan Lung
4cddd81120 Suicide now uses the pronoun helpers (#20973)
* This doesn't actually matter, because you're dead forever once it happens...

* is this entire pr chaff for something else

* you'll do it? nah, fuck that I'll do it
2016-10-18 14:36:38 +13:00
oranges
980d830eb7 Merge pull request #20702 from TheCarlSaganExpress/sagan_branch
Fixed a runtime error when eating a crayon.
2016-10-10 11:18:44 +13:00
TheCarlSaganExpress
494bf90f90 TEACH ME YOUR WAYS MAINTAINERS 2016-10-02 23:35:35 -04:00
TheCarlSaganExpress
7889593e80 Forgot stuff 2016-10-02 20:51:15 -04:00
TheCarlSaganExpress
f916e7c331 Suggestion by optimumtact (fix) 2016-10-02 20:50:29 -04:00
Joan Lung
bdcb16113a Adds a few turf istype helpers (#20754)
* a very calming act
when the world is too much, too fast

* i'm tired
but i have to be efficient, infinite

* lick your lips at the sight of me
a fantasy made reality
2016-10-01 19:25:46 +02:00
TheCarlSaganExpress
b88a4572a4 Changed to \the 2016-09-30 00:45:12 -04:00
TheCarlSaganExpress
1a554d8bd2 Removal and grammar fix 2016-09-29 22:38:38 -04:00
TheCarlSaganExpress
36e52cf79b Added user as an argument 2016-09-27 20:36:17 -04:00
TheCarlSaganExpress
3a8c7ecbd7 Update crayons.dm
Changed to reagents.total_volume
2016-09-27 19:24:35 -04:00
TheCarlSaganExpress
433305b967 Fixed a runtime error when eating a crayon. 2016-09-26 20:16:58 -04:00
phil235
443a4501ec Carbon Dismemberment , second attempt. (#20461)
* - I rearranged X_defense.dm mob files, more damage_procs.dm.Here's what's inside:
* X_defense.dm: is for the procs of attacks onto the mob, all the XXX_act() proc (things happening to the mob), as well as protection check and get procs (armor, ear prot, projectile dismemberment)
* damage_procs.dm: actual damage procs like adjustBruteLoss() getfireloss, any proc that handles damaging.

- some bugfixes with gibspawner effects.
- monkey's bodyparts can be dismembered and are used to create its icon.
- brains are no longer carbons.
- all carbon have bodyparts that can be dropped when the mob is gibbed.
- adminspawned bodyparts now have a default icon.
- robotic parts are now a child of bodyparts.
- health analyzer on alien/monkey shows damage on each limb
- added admin option to add/remove bodyparts for all carbon (instead of just remove on humans)
- Fixes keycheck message spam for janicart and all when trying to move.
- Fixes bug with buckling to a scooter while limbless.
- removed arg "hit_zone" in proj's on_hit() because we can already use the def_zone var (where hit_zone got its value)
- Fixes mob not getting any damage when hit by a projectile on their missing limb, despite a hit message shown). carbon/apply_damage() now when we specify a def_zone and the corresponding BP is missing we default to the chest instead of stopping the proc. Consistently with how human/attacked_by() default to its attack to chest if missing limb.
- Fixes mini uzi icon when empty and no mag (typo).
- I renamed and changed a bit check_eye_prot and ear prot
- renamed flash_eyes to flash_act()
- I made a soundbang_act() similar to flash_act but for loud bangs.
- added a gib and dust animation to larva.
- husked monkeys
- no damage overlay for husk or skeleton.
- damage overlay for robotic limb now.
- no damage overlay when organic bodypart husked.
- one handed human with a bloody hand still get a bloody single hand overlay.
- fix admin heal being unable to heal robotic bodyparts.
- slightly touched robotic bodypart sprites (head one pixel too high)
- Fixes 18532 "beheaded husk has hair".
- Fixes 18584 "Ling stasis appearance bug"
- no more eyes or lipstick on husks.
- can remove flashes/wires/cells from robot chest and head with crowbar.
- Fixes not being able to surgically amputate robotic arm/leg.

* More merge conflict fixes and adding the new files I forgot to add.

* of course I forgot birdstation

* More typos and stuff I forgot to undo.

* Fixing a typo in examine.dm
Removing an unnecessary check.
Making admin heal regenerate limbs on all carbons.
Monkey-human transformation now transfer missing limbs info and presence of a cavity implant.
NODISMEMBER species can still lack a limb if the mob lacked a limb and changed into that new species.
Changeling Regenerate ability now also regenerate limbs when in monkey form. (and remove some cryptic useless code)

* Fixing more conflicts with remie's multihands PR.

* Fixes runtime with hud when calling build_hand_slots().
Fixes lightgeist healing not working.
Fixes null.handle_fall() runtimes with pirate mobs.
Fixes typo in has_left_hadn() and has_right_hand().

* Derp, forgot to remove debug message.
2016-09-12 19:33:50 +02:00
Shadowlight213
4a2242b505 Fixes division by zero with gang spraycans (#20263)
Fixes list index out of bounds runtime in VV
2016-09-03 22:28:32 +02:00
Joan Lung
e6259d32e3 Merge pull request #19406 from Niknakflak/ImABigBoyNow
Makes crayons not racist anymore
2016-07-23 18:40:10 -04:00
NikNakFlak
17d4b29791 Desegregates crayons 2016-07-20 00:13:08 -07:00
Remie Richards
8b8c5e0b76 Ratvarian grammar/punctuation rules are now enforced by code, automatic ratvarian is no longer just rot13 without the rules. 2016-07-19 23:25:14 +01:00
Jack Edge
0d10a1f950 Changes to large graffiti
🆑 coiax
rscdel: Large graffiti now consumes 5 uses from limited use crayons and
spraycans, as well as taking three times the amount of time to draw.
/🆑

- Also fixes bug where clown colorful reagent wasn't being applied to
all three turfs.
2016-06-25 21:54:49 +01:00
Cruix
ac0bad5d61 Added priority overlay system. (#18225)
Added priority overlays to atoms, which will not be removed when overlays are cut and will always remain on top when new overlays are added. This requires everyone to use add_overlay() and cut_overlays() instead of overlays += and overlays.Cut(). These procs are found in __HELPERS/icons.dm, and the priority overlay list is found in game/atoms.dm. Everything else is replacing deprecated overlay manipulation.
2016-06-17 10:11:53 +12:00
xxalpha
ffc5bb5402 Better looking sprites and bug fixfsjasf 2016-06-11 16:01:30 +01:00
xxalpha
9898f948b7 LARGE GRAFFITI 2016-06-10 22:31:38 +01:00
bgobandit
011bca9a3e Interrupted drawings will not affect the text buffer. 2016-06-08 23:34:27 -04:00
oranges
953fe2852b Merge pull request #18039 from coiax/alt-click-spraycan
Adds alt-click to spraycans
2016-05-31 15:55:22 +12:00
Jack Edge
0c95c90286 Adds alt-click to spraycans
🆑 coiax
rscadd: Alt-clicking a spraycan toggles the cap.
/🆑
2016-05-29 19:51:38 +01:00
Jack Edge
badec181c4 Bring back my APC checks 2016-05-28 13:55:07 +01:00
Jack Edge
e81fd145cc You saw nothing 2016-05-28 13:50:04 +01:00
Jack Edge
a729b83265 Fix: Gang tags can be sprayed over
Fixes #17957.

🆑 coiax
fix: Gang tags can again be sprayed over.
/🆑

Also got rid of this APC check which doesn't work anyway because APCs
loc is on the floor and then it's pixel shifted.
2016-05-28 13:40:51 +01:00
Jack Edge
1c92b17e3d Fixes some last minute spraycan bugs
- Cyborgs can now use their spraycans
- Spraycans are different colours
2016-05-23 20:26:40 +01:00
Jack Edge
6914282b9f Code review 2016-05-23 19:35:01 +01:00
Jack Edge
56b97fc315 Refactors crayons and spraycans
Fixes #17663

A reminder: spraycans are just special types of crayons for REASONS.
- Crayons and spraycans now use TGUI
- Crayons and spraycans now have internal reagent containers
- Crayons contain that crayon powder stuff, and nutriment
- Spray cans contain ethanol and welding fuel as before
- Spray cans will now no longer flush half a bottle of vodka into your
system when you are sprayed in the face
- Added some special admin only spraycans with sprites
- Maybe more? I can't remember, it's been a long day.
2016-05-21 02:39:21 +01:00
phil235
1b24cc7e6a Moved crayon code out of toys.dm and into crayons.dm
Fixes being able to throw kinetic grabs.
Fixes washing machine code being shit. Also fixes clothes coloring via washing machine being broken.
2016-05-10 22:53:47 +02:00
Jack Edge
7c293f0aa6 Spray cans contain flammable solvents
Also, spraying someone will stun them even if they lack a client.
2016-05-02 22:19:49 +01:00
Jack Edge
d9aac22800 Code review 2016-05-01 16:10:00 +01:00
Jack Edge
51d3dc9242 Hand labeler 2016-04-30 18:44:01 +01:00
Jack Edge
3d458b857c Service cyborgs get a spraycan
🆑 coiax
rscadd: The Service cyborg module now has a spraycan built in, for
hijinks and passing on important urban messages.
/🆑
2016-04-30 15:26:22 +01:00
phil235
0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
duncathan
e86cf0f280 praise the good lord, for the game finally compiles 2016-03-29 19:04:37 -06:00
duncathan
b9950c4358 turf/open and turf/closed 2016-03-29 13:38:56 -06:00
duncathan
5bf31463da removes simulated turfs; adds space gas mixture for space 2016-03-10 17:27:01 -06:00
phil235
83633edfed - I renamed some of the new adjust procs and create new ones for eye_blind,eye_blurry and eye_stat so they get three procs just like weakened/sleeping/etc.. (Sleeping, AdjustSleeping, SetSleeping)
- renamed the eye_stat var to eye_damage.
- mob/on_varedit() added. Manually var editing a mob's eye_blind var properly updates his vision.
- I removed update_vision_overlays(), we now just update the relevant fullscreens instead of all fullscreens whenever one needs to be updated.
- fixed climbing into mecha not giving you mecha sight.
- simplified and removed copypasta from update_tinttotal() (now update_tint() )
2016-02-07 18:50:18 +01:00