Commit Graph

2135 Commits

Author SHA1 Message Date
Cheridan
385f74cf05 Merge pull request #19216 from coiax/table-stuff
Dull table stuff refactoring
2016-07-09 15:02:03 -05:00
Jordie
55aa265842 Merge pull request #19211 from ChangelingRain/couldyoupleaseconvertmorestuff
Slightly more construction value is required to unlock scripture
2016-07-09 22:27:48 +10:00
Core0verload
9edf034fa9 Changes a bit how hardsuit jetpack upgrade works (#19165)
Hardsuit jetpack upgrade item is replaced by an actual jetpack - the same as the one that exists inside the upgraded suit. It still can't be used separately.

Hardsuit jetpack has hardsuit jetpack sprites instead of voidsuit pack.

You can remove jetpack from hardsuit by using screwdriver on it.

Unrelated:
Fixes mining vendor UI a bit: items with long names no longer take two lines.
Changes staff of storms path to actual staff.
2016-07-09 18:17:43 +12:00
Jack Edge
c8275384be Dull table stuff refactoring
- Uses a timer, cleans some returns, nothing exciting
2016-07-08 17:10:02 +01:00
Joan Lung
fa12bbacd6 Slightly more construction value is required to unlock scripture 2016-07-08 07:58:59 -04:00
coiax
ca167d4ba2 Opening crates with a crowbar will drop manifest (#19164)
- Also drones can now use the Toggle Open verb.
Fixes #19084.
2016-07-07 13:25:26 -04:00
Xhuis
d818ccee79 Necropolis Beautification (#19134)
* Lavaland patch

* Conflicts

* Now with 100% more compiling

* Removes balance changes

* Conflicts 1

* Conflicts 3

* Updates the map
2016-07-05 20:15:19 -04:00
coiax
6449b65d30 Adds fireplaces, eswords are hot, cardboard is flammable (#19118)
Makes needed improvements to proposed fireplaces

- Fireplaces now use world.timer
- Fireplaces no longer prompt input() for inserting logs, it just
takes as many logs as possible
- Paper and paper bins can be thrown on the fire, thirty paper is worth
one log of burn time.
- One log gives 15 seconds of burn time, the fireplace can hold up to 5
minutes of fuel.
- Ignitable items now use a /obj level proc to generate their messages,
currently using this are cigarettes, candles, fireplaces
- The fireplace can be put out with an extinguisher
- Cardboard cutouts are now flammable
- The fireplace is only "warm and cozy" when lit
- Paperbins qdel their stored papers when destroyed (probably did that
already, but no harm in making sure)
- Also removed some returns hanging around

* Added new proc for lighting stuff

- Adds ignition_effect(atom/A, mob/user) to obj/item, which is called
when you're attempting to light things with that object. By default it
does nothing and prevents ignition, but if the object is hot, it returns
a message. May do other things for different stuff.

- Eswords now ignite flammable gasses in their area.

* Fireplace is no longer on fire when not on fire
2016-07-06 10:16:47 +12:00
MMMiracles
69c676617b Making Space Great Again (implying it ever was): Part Uno (#19085)
Adds space ruins. Balance not included.
Simple mob ghosts actually work now.
Puzzle1 ruin removed due to issues with projectiles.
2016-07-05 00:02:42 +12:00
AnturK
02bdb52704 Merge pull request #19066 from Cruix/misc_fixes
Misc fixes
2016-07-03 13:41:19 +02:00
oranges
a110fe9a14 Merge pull request #18980 from Incoming5643/THE_COWS_THE_FOODS
Adds large metal boxes: 2015 Unmerged Pull of the Year Edition
2016-07-03 09:30:22 +12:00
unknown
6491bcd5f1 Fixed hand labelers being unable to label storage items.
Fixed being unable to resist out of wrapped lockers.
Fixed being unable to resist out of lockers inside morgues.
Fixed mechs being able to spam doors they do not have access to.
2016-07-01 20:32:32 -04:00
oranges
7967e07b3d Merge pull request #19045 from Niknakflak/AHAAA_STOP_BEING_INVINCIBLE
Showcase deconstruction/moving
2016-07-01 20:05:03 +12:00
Firecage
c61b16b37b Fixes 2 bugs with mirrors. (#19015)
You can no longer use TK on a mirror to change your 
appearance while far away from the mirror. You have 
to be adjacent to it. Fixes #18823

You can no longer normally use shattered mirrors, they
now properly become shattered. Yes, you could shatter
a mirror and still use it, stealthily. Honk.
2016-07-01 13:34:19 +12:00
NikNakFlak
da5eac806a Fuck Coding 2016-06-29 23:57:38 -07:00
Joan Lung
7a51fca7cf Merge pull request #18977 from bobdobbington/fixes_display_case_telekicking
Fixes #18923
2016-06-29 11:00:44 -04:00
MMMiracles
11ce5c5a78 Adds some ruins (#18946)
* dead already

* heres some ruins ok thanks

* huh

* remie changes

* derelict changes + ORIGINAL ASSETS
2016-06-28 22:10:23 +12:00
bgobandit
10d32cd9d4 Fixes/tweaks a lot of typos/descriptions. (#18956) 2016-06-28 22:02:28 +12:00
Incoming
62e01be89c Like the normal ones, except:
*can fit five people
*can take a lot of punishment before breaking
*slow as garbage to move in
*only exist near the syndicate drop pods
*became utterly required once STEEL RAIN was added

🆑 incoming5643
rscadd: Nuke ops can now harness the power of METAL BOXES: special versions of cardboard boxes that can take a lot of abuse and can fit the whole team if need be. They're not nearly as light as their cardboard brothers though...
/🆑
2016-06-28 00:03:36 -04:00
bobdobbington
6cfa29dc2b Now with 100% of the daily recommended dose of Vitamin C 2016-06-27 19:32:21 -07:00
bobdobbington
4fc41bac33 Fixes #18923 2016-06-27 19:05:26 -07:00
Xhuis
8a852f196b Removes shadowling (#18951) 2016-06-27 20:53:35 -04:00
Jack Edge
e1943df2c8 Finally finishes whiteship_meta 2016-06-22 22:04:22 +01:00
oranges
ca7067eded Merge pull request #18741 from KorPhaeron/tacticalespionageaction
Tactical Espionage Action
2016-06-22 12:08:05 +12:00
oranges
3a7eab6e05 Merge pull request #18729 from coiax/remove-spawn-3
Remove spawn III
2016-06-21 20:11:08 +12:00
oranges
e2718408df Merge pull request #18720 from Supermichael777/Flaps-fix
Makes beapsky able to use his room and all bots be able to use flaps
2016-06-21 09:35:15 +12:00
Supermichael777
f35a410ab6 Stupid github didnt show your coment the first time 2016-06-20 09:16:47 -04:00
Kyle Spier-Swenson
0d6bbbb412 stop the pills (#18703)
* RedPills Processing

Now you have to use START_PROCESSING(SSname, thing) (and STOP_PROCESSING)

* Fixes a minor bug.
2016-06-20 12:07:44 +02:00
Supermichael777
f6dd9cc402 Actualy fixes the bug because OBTUSE PROC NAMES. 2016-06-19 18:53:44 -04:00
KorPhaeron
74e451e7ce Sneaking Mission 2016-06-19 14:39:39 -05:00
coiax
961a6c4c26 Adds potted plants to cargo packs (#18662)
🆑 coiax
rscadd: Potted plants can now be ordered from cargo.
/🆑
2016-06-19 14:05:18 -05:00
Jack Edge
9185f06d31 Removes spawn from things 2016-06-19 01:25:29 +01:00
Supermichael777
a17e676f05 Such a hard fix pudl 2016-06-18 14:23:00 -04:00
Xhuis
2dd8617ced Grammar fixeroni 2016-06-17 00:18:37 -04:00
Xhuis
df08005b60 Two fixes 2016-06-17 00:13:17 -04:00
Xhuis
75d9e4174f [s] Lavaland Patch (#18398)
* Commit squash before update to master

* Removed repathing and slot machine shenanigans

* Legion spawn changes

* Map edits, round II

* Some changes

* Removes map changes, hopefully

* Conflicts 1

* Updates the maps

* Conflicts 2

* How about now?

* Remaps the colossus arena

* Restores old colossus spawning
2016-06-16 22:00:09 -05:00
oranges
8c9308acca Merge pull request #18613 from Core0verload/runtime_down
Puts down two runtimes
2016-06-17 13:40:03 +12: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
c0
458a38cf21 Puts down two runtimes 2016-06-16 06:46:26 +03:00
oranges
829243360d Merge pull request #18489 from Core0verload/ce_jetpack
Brings back CE's hardsuit jetpack
2016-06-15 10:44:59 +12:00
Joan Lung
8582d0fbbd Chairs now handle layer updates/rotation with setDir 2016-06-12 22:56:41 -04:00
oranges
d7c748a558 Merge pull request #18472 from phil235/HackyShit
Fixes Synths
2016-06-13 09:24:52 +12:00
oranges
99620ffe76 Merge pull request #18481 from phil235/PlantsGunsShit
Moving code around
2016-06-13 00:14:29 +12:00
c0
b615fb504f Brings back CE's hardsuit jetpack 2016-06-12 09:18:39 +03:00
Remie Richards
b3b60b187b Manual repair of some edge cases. 2016-06-11 23:11:54 +01:00
phil235
3b8af6f5ff Fixes grille/New() not calling ..()
Blood drips icons are now in blood.dmi instead of drip.dmi (which only had the 5 drip sprites).
Moved projectiles, guns, casings and ammo boxes to be in the right files. Please don't put your gun with its projectile, ammo casing and ammo box all the same file.
I split growing.dmi into 5 smaller files so we don't get close to the 512 icon limit again. Each seed has a var to indicate which icon file to use when planted.
Fixes code for heavy pulse laser projectile to be less awful.
2016-06-11 23:18:26 +02:00
Remie Richards
fda2c699fc Automatic conversion via Regex 2016-06-11 18:37:48 +01:00
phil235
9e5e525335 Fixes admantine golem female body icon. Now all golems have a female version.
The wizard can no longer choose to become a military synth.
2016-06-11 17:13:12 +02:00
Joan Lung
4b9c4c7adb Merge pull request #18394 from lzimann/stools2
Bar stool no longer becomes a normal stool and are now constructables
2016-06-09 22:01:19 -04:00
Lzimann
9a9fd0a06a I fucked up 2016-06-08 22:36:04 -03:00