Commit Graph

1000 Commits

Author SHA1 Message Date
duncathan salt
065a2d7688 Merge pull request #25716 from Haevacht/patch-4
Fixes Proto-Kinetic Crusher facestabs, they're backstabs now.
2017-04-02 02:06:57 -06:00
Haevacht
d9f5fc87bb Update equipment.dm 2017-04-01 13:59:44 +11:00
Haevacht
916a596a51 two lines technically i guess
dont need a var/backstab anymore
2017-03-31 18:50:35 +11:00
Haevacht
89297f19ad Update equipment.dm 2017-03-31 18:45:55 +11:00
Cyberboss
b28ee72a47 Fixes smartfridges 2017-03-30 22:51:04 -04:00
Joan Lung
0750a7dffb Simple animal attacks with bonus effects now properly respect shields (#25571)
* Simple animal attacks with bonus effects now properly respect shields.

* very boring fixes
2017-03-30 11:16:36 +13:00
AnturK
55208b2627 Fixes coin flipping (#25518) 2017-03-27 15:42:03 -03:00
Leo
005f8f1889 Fixes sheets runtiming on ORM (#25464) 2017-03-25 15:29:09 -04:00
Lzimann
e123aac805 Fix new qdeletion on coins 2017-03-22 17:08:23 -03:00
Leo
6845cab264 Merge pull request #25189 from Supermichael777/golem2
Adds an id card to the free golem ship vendor
2017-03-17 23:25:10 -03:00
Cheridan
44b6e31725 Merge pull request #25181 from lzimann/orm
Refactors ORM code
2017-03-17 17:28:42 -05:00
Lzimann
cb4b9a91c6 Requests console now have a receive ore updates variable.
Also updates all maps with it.
2017-03-17 15:04:00 -03:00
Iamgoofball
099c822b7c RCD refactor (#25154)
* Refactors RCD code
2017-03-17 00:22:22 -03:00
Supermichael777
b533abe073 Adds an id card to the free golem ship 2017-03-16 21:43:45 -04:00
Lzimann
cdd8843d49 Refactors ORM code 2017-03-16 19:24:27 -03:00
Cyberboss
012eaec1b9 Mob Initialization (#24840)
* Mob Initialization

* new_player Repath

* Fix the dme

* Fix the shit

* Fix a loc

* Fix another loc

* But, in my haste, I forgot the cola!

* Another loc

* ANOTHER LOC

* Further docs

* Where'd that s come from

* Fix shit

* Better
2017-03-13 20:21:12 +01:00
AnturK
e1d7eff8ff Fixes air runtime and adds air flow blocker for mappers (#24932)
* Every time.

* comment grammer
2017-03-13 11:36:45 +13:00
AnturK
e5b964f11e Fixes stack splitting (#24941)
* Fixes stack splitting

* Integrates other bugfix in this
2017-03-13 11:34:15 +13:00
oranges
e21d4534ff Merge pull request #24873 from Bawhoppen/simpleanime
Separates simple animals icon file
2017-03-11 17:09:03 +13:00
Lzimann
ae25d8a4d0 More fixes to outputs with extra/no spaces 2017-03-10 13:56:46 -03:00
Lzimann
5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
coiax
473561c0be Wizards can now Summon Ghosts (#24794)
* Wizards can now Summon Ghosts

🆑 coiax
add: Wizards can now use their magic to make ghosts visible to haunt
the crew, and possibly attempt to betray the wizard.
/🆑

- Summon Ghosts, makes ghosts visible for the rest of the round.
- Modifies the Summon Events G-g-ghosts! event to also use the same
mechanism of making all ghosts visible.
- New global var `observer_default_invisibility`, which all ghosts load
their invisibility from when created. You need this because ghosts get
destroyed and created every time you exit and reenter a body. Modified
the spectral sword to use this, instead of initial().

- Pros for wizards to summon ghosts: It's spooky, and distracts the
crew, they get to see the ghosts come out of the dead people they just
murdered.
- Downsides of wizards to summon ghosts: They'll be always obvious when
etheraling around, they can't really stealth, ghosts will do their best
to upset the wizard's plans.
- If you were playing to WIN as a wizard, you probably wouldn't summon
ghosts. But you wouldn't summon guns or magic either.

* Makes it buyable
2017-03-10 09:46:04 +13:00
Lularian
96df592ef6 simple animals 2017-03-09 03:41:35 -06:00
GunHog
c03d9c2bf0 Adds missing access to the Aux Base Console (#24653)
The research access was missing from the base management console. It
exists on the first airlock, meaning scientists could get into the base,
but not attempt to launch it.
2017-03-06 11:57:11 +01:00
GunHog
2c3b291648 Aux base construction console fix (#24652)
* Check that detected console is inside base before binding

- The camera computer will now locate the correct Aux Base computer, the
one inside of the Aux Base.

* Fixes mining shuttle beacon as well

Applies the fix to the shuttle beacon so it does not bug out either
2017-03-06 11:55:42 +01:00
PJB3005
a63608d023 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-03-03 16:31:00 +01:00
GunHog
9771423512 Fixes mining shuttle landing inside the aux base (#24594)
The mining shuttle beacon now properly checks that none of the turfs of
the shuttle LZ intersect the Aux Base.
2017-03-03 14:36:47 +01:00
coiax
b3a52289ef Posters refactor (#24548)
* Posters refactor

- Posters now use a simple type-per-poster definition, rather than some
large global lists requiring sprite numbers to be the same as entries in
a list.
- Putting a specific poster on a map now simply means putting the
specific type that you want, rather than var editing (often
unsuccessfully).
- There are random all-posters, random contraband posters, and random
official posters for mappers too.
- Ripped posters are now their own type.
- The potential to make additional classes of posters has been left
open, I'd like to move a bunch of the advertisement posters to their own
catagory, and clean up the "official" category to be more obviously
on-brand.

* Updates DeltaStation

* Changed the maps of Metastation

* OmegaStation posters updated

* Updated Pubby posters

* Map merged?

* Updated away mission and ruin posters

* Removes vars from garbage
2017-03-03 11:16:19 +13:00
XDTM
9f7bffa1b2 Multitools can change the I/O dirs of ORMs (#24460)
* Multitools can change the I/O dirs of ORMs

* remie

* invert!
2017-02-28 18:03:25 +13:00
Cyberboss
56a6eaa8e6 Overlay queuing (#23922)
* Overlay queuing

* Fix SS flags

* Don't copy on assignment

* Flags processing

* Fix icon_smoothing

* MSO's helper proc

* Legacy detection

* Make it work

* Fixes shitcode

* Fix the flag

* |= -> +=

* OK, how did I fuck that up?

* shitcode

* Conditional assoc queue while initializing

* Cleanup everything

* Orange meme

* This isn't perfect, but its the best byond will give us.

* forgot about dir

* oh ya

* This was litterally the last thing i did last night before heading to bed

You can tell can't you?

* Fixes various shit

* Let's not ever pause

* Fix the flag

* Cleaned up some missing shit. Added image dummys

* Remove the one usage of FPRINT

* Jesus get rid of this
2017-02-22 21:44:55 +13:00
Pieter-Jan Briers
1956ace5c7 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-19 15:10:23 +01:00
Cyberboss
1365ab99d8 Merges map templates and map loader (#24140)
* Reorganize the mapping code

* Finish this up

* Reee line endings

* FUCKING LINE ENDINGS

* LINARU ENDARU

* >PLS SET REPO LINE ENDINGS

* Comments

* Hoisted by my own travis.yml changes
2017-02-19 16:55:02 +13:00
Pieter-Jan Briers
9b20c1e6c2 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-18 23:40:34 +01:00
Pieter-Jan Briers
180c566468 Fixes 2017-02-18 23:39:11 +01:00
GunHog
347b384977 Aux Base Improvements (#24146)
* Aux Base Improvements

- The Base Management Console (BMC) may now set up its own landing zone
at random if mining has not prepared a drop zone.
- The BMC may now control the Perimeter Defense Turrets built by the
construction console. Their status and health may be checked from the
BMC as well.
- The PDTs now have slightly increased damage and fire through glass.
- Moved the BMC to its own file.
- Changed the path of the BMC in order to function properly as its own
computer type.
- The Aux Base's dock now doubles as a public mining shuttle dock once
the base is dropped and shuttle landing beacon set up. Controlled from
the BMC.
- Removed access requirements from the Box station mining shuttle to be
compabile with the public dock.
- Added a base construction console to Deltastation, moved the shuttle
beacon inside of the base, and moved a potted plant.

* Fix Maps

Fixes conflicts by redoing my previous edits

* Fix Maps again

Forgot to use the correct docking port, and remove access from one of
the Delta station mining shuttle doors

* Fix Pubby

My lack of experience with maps shows again!!

* 3/4 Suggested Changes

- Cleans up some code

* Final requested change

Href exploit prevention I guess?
2017-02-18 20:37:38 +01:00
Pieter-Jan Briers
b5b93e51f7 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-18 16:52:07 +01:00
Cyberboss
d27899ce64 Unequip refactor fix pack (#24040)
* Fixes drag drop deletion

* Fix it for clothing as well

* Do it properly

* Various other incap checks I noticed from the unequip refactor

* Time to generalize this shitty shit

* PADDLING!!!

* A whole bunch of ree
2017-02-14 08:52:56 +01:00
PJB3005
f11c558c99 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-12 16:35:57 +01:00
GunHog
367454c7eb Aux Mining Base Construction Console (#23683)
* Aux Mining Base Construction Console

- Adds the base construction console (code only)
- Adds the consoles to the maps and moves things around a little.

* Makes eye visible

Hopefully this actually makes the eye visible to all players when the
console is in use.

* Map Fix

I hope this fixes the map issue!

* Map conflict fixes.

I hate maps. Maps suck. They are so annoying and evil. All I know is
pain.

* Turrets and tweaks

- The base console may now build up to four plasma defense turrets,
calibrated to only attack hostile mobs, never humans.

- Added construction sounds for building things with the base console.

- Fixed a bug with tiny fans placement

* Two new sprites

Credit to chanoc1

* Construction Drone Sprite!

- Adds the construction drone sprite to replace the visible [ ]
indicator!
- Small tweaks and fixes to it!
Sprites by WJohnston!

* Turret flavor

- Added fluff text to the turrets!
2017-02-12 13:10:10 +01:00
PJB3005
8ce6ae2b87 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-08 14:30:23 +01:00
Militaires
0b21e2f51b FUCK (#23695)
Buckling fix
2017-02-05 13:20:11 +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
Joan Lung
f2b4cd7dca Fixes a bunch of things being able to get to centcom (#23485)
* Fixes a bunch of things being able to get to centcom

* whoops

* smart
2017-02-01 15:52:51 +13:00
Cyberboss
3f7f5d4000 Removes/Refactors /mob/unEquip (#22918)
* Part1

* IT COMPILES!!!!

* Fuck wait this was missing from that last

* Update handlabeler.dm

* Update handlabeler.dm

* Fixes n shit

* Fix this

* Fixes #23310

* Fucking @RemieRichards was right

* Fixes devil unEquip

* WTF ARE BITFLAGS?

* THERES THE FUCKING PROBLEM

* Fixes
2017-01-31 09:28:31 +13:00
Cyberboss
f7c9749ca0 Fixes some bad addtimer calls. Adds INVOKE_ASYNC. Replaces addtimer(..., 0) (#23424)
* Fixes some bad addtimers

* Adds INVOKE

* Warning for addtimer

* Working syntax

* Another bad call

* Fixes the addtimer warning

* Add suppress_zero_warning to addtimer

Useful for addtimer that uses vars

* Add INVOKE_AGAIN for when the var is already defined

* Replace addtimer(...,0) with INVOKE((...))

* Much more sensible syntax

* Less overhead, less copypaste

* Rename INVOKE_ASYNC

* Use a macro

* Allman style

* Wait, why make it a datum in the first place?

* Revert the rename

* Rename again, keep line endings

* typo

* More typos

* Untouches Addtimer

* Update callbacks.dm

* Update timer.dm

* Revert allman style

* Revert "Revert allman style"

This reverts commit 47361da15bd04eca138be5f13acdc9dd5ba89331.

* Trying to match that whitespace diff

* Why is this missing?

* I'm not fucking dealing with this!
2017-01-31 09:20:54 +13:00
oranges
878faf4659 Merge pull request #23211 from KorPhaeron/stimpacks
Removes stimpacks from mining
2017-01-30 09:50:35 +13:00
Joan Lung
c9ada5cea3 Merge pull request #23214 from KorPhaeron/megafauna
Megafauna won't heal while on station
2017-01-24 10:23:04 -05:00
Kyle Spier-Swenson
12570805bd Closes the Pool. (#23150)
* Delete pool.dm

* Removes usage of PoolOrNew

* Wrap up
2017-01-22 16:00:23 -05:00
KorPhaeron
e35a1d18b4 Typo Fix 2017-01-21 12:24:03 -06:00
KorPhaeron
9fff5ab55f Blood Contract 2017-01-21 12:09:04 -06:00