Commit Graph

9183 Commits

Author SHA1 Message Date
oranges 1e3db8d8bb Merge pull request #24742 from coiax/secondary-frozen
Moves the `is_frozen` var to a secondary flag
2017-03-09 11:20:51 +13:00
Joan Lung ea99851a07 Clockcult stuff has colored lighting (#24678)
* Clockcult stuff has colored lighting

* fixsigils
2017-03-08 12:03:12 -06:00
coiax f88184937a Glowsticks (#24761)
* Ports glowsticks from Bay

* Adds glowstick sprites

* Glowsticks in party crates, maint and emergency toolboxes
2017-03-08 02:38:15 -06:00
TalkingCactus f04feec7a1 Adds Colored Lights for Energy Swords (#24765)
* colored lights for energy melee weapons

* New() -> Initialize()

* dualsabers

* woops?

* removes unused var

fixes energy axe typo
2017-03-08 02:34:50 -06:00
Cheridan deb4c2cde3 Merge pull request #24743 from ChangelingRain/glowshrooms
Glowshrooms now have colored light, tweaks glowshroom/glowberry lighting range
2017-03-08 02:30:46 -06:00
coiax 2d288690e1 New Librarian traitor item: Haunted Magic Eightball (#24607)
* New Chaplain traitor item: Haunted Magic Eightball

🆑 coiax
add: Toy magic eightballs can now be found around the station in
maintenance and arcade machines. Ask your question aloud, and then
shake for guidance.
add: Adds new Chaplain traitor item, the Haunted Magic Eightball.
Although identical in appearence to the harmless toys, this occult
device reaches into the spirit world to find its answers. Be warned,
that spirits are often capricious or just little assholes.
/🆑

* Compiles, fixes the bugs

* Adds toy eightballs to loot, toys; adds haunted to uplink

* Every 3 minutes

* Noiseless, random haunt, limited stock

* Added sprites for eightball

* Removed notice to replace sprites

* Librarian only
2017-03-08 12:14:44 +13:00
coiax 311ea1c7f1 New wizard spell: The Traps (#24571)
* New wizard spell: The Traps

🆑 coiax
add: Wizards now have a new spell "The Traps" in their spellbook.
Summon an array of temporary and permament hazards for your foes, but
don't fall into your own trap(s).
/🆑

Conjures some traps in an aoe, traps include Hand of God traps and
swarmer shocking traps. Hand of God traps require 60 seconds to recharge
between trapping.

I saw Cobby give this as a TC trade, and I thought it seems reasonable
as a silly wizard spell.

* Added The Traps to spellbook, modifed trap code more

* Adds action icon for The Traps

* Need to be adjacent to disarm

* Invocation is now Latin for "BEWARE THE TRAPS"
2017-03-08 12:13:03 +13:00
PKPenguin321 3a1b0b2b6c Adds a new arcade prize, take two (#24660)
* adds fake chasm tiles

* adds to arcade machine list

* swood this

* swood that
2017-03-08 11:19:53 +13:00
Jack Edge 69c227612f Moves the is_frozen var to a secondary flag
One less var on ALL OBJECTS.
2017-03-07 21:27:44 +00:00
oranges 37b194d6ed Merge pull request #24708 from Cheridan/the_c_does_not_stand_for_cheesy
NERFS THE SHIT OUT OF C4+THROWING STARS BECAUSE ITS CHEESY AND SHAMEFUL
2017-03-08 09:46:12 +13:00
oranges 12e6d6c64c Merge pull request #24650 from coiax/admin-renaming-tools
Admins have more tools for renaming the station
2017-03-08 09:23:36 +13:00
oranges e575a9ac52 Merge pull request #24751 from Cyberboss/patch-20
Fixes the dumbest shit I've ever seen
2017-03-08 09:10:45 +13:00
Joan Lung f36940d1c0 Circuit tiles now glow faintly (#24722)
* Circuit tiles now glow faintly

* one missed
2017-03-07 21:04:04 +01:00
Joan Lung 774f7e3100 Fixes things having latches that shouldn't (#24715) 2017-03-07 12:19:57 +01:00
Supermichael777 f7a38c2113 Adds a Chameleon belt (#24569)
* adds a mildly evil belt

* adds the belt to a kit that sorely needed it
2017-03-07 09:10:36 +01:00
Joan Lung a73cb2cfce Not Bioluminescence 2017-03-06 20:41:36 -05:00
Joan Lung 08cc485e98 glowy shit 2017-03-06 20:35:57 -05:00
Cyberboss c9eb5b86f0 Fixes the dumbest shit I've ever seen 2017-03-06 15:17:35 -05:00
Joan Lung 10100f1d9f Glowshrooms now have colored light 2017-03-06 13:19:40 -05:00
Cyberboss 4ed57234b7 Ports some low level New()s to Initialize (#24211)
* Revert "Revert "Ports some low level New()s to Initialize""

* Fixes #24202

* Fixes #24197

* If ever it were to exist, it belongs here
2017-03-06 19:19:14 +01:00
Xhuis 86488d18d3 Fixes some issues and closes others; nerfs abductor emergency teleporter (#24690)
* Fixes Wish Granter resurrection spam

* Fixes box icons

* Emergency teleporter nerf
2017-03-06 12:20:55 +01:00
Cheridan 14e384b2e8 c4 tweaks 2017-03-05 13:18:32 -06:00
Joan Lung d5c870e714 Merge pull request #24662 from lzimann/individuallog
Adds a way to see a persons's individual logs for the round.
2017-03-05 11:57:37 -05:00
Lzimann e58ee1724f Refactors logging into a single var for all mobs and adds a wrapper for proper logging. 2017-03-04 13:32:35 -03:00
PJB3005 64db72a150 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-03-04 16:31:55 +01:00
coiax 81eae8b473 Adds "secondary flags"; stops cyborg radio EMP wires (#24613)
🆑 coiax
fix: Cyborg radios can no longer have their inaccessible wires pulsed by
EMPs.
/🆑

Adds a secondary flags system, for stuff that should be set as a flag,
but is too rare to clog up one of our coveted high speed flag slots.
Uses a null list to store the flags, when instanced, the list is in the
form flag_string->booleon, for the highest speed. I suggest we locate
other rare flags and move them to this system. (Like EARBANGPROTECT, I
mean come on).
2017-03-04 23:39:27 +13:00
jughu 7e2fc83e1f Detective's revolver and ammo now starts in his holster (#24622)
* Update belt.dm

* Update security.dm

* Update belt.dm
2017-03-04 01:05:38 -06:00
Jack Edge 7ab0bd5400 Admins have more tools for renaming the station
🆑 coiax
add: Admins have a "Rename Station Name" option, under Secrets.
add: A special admin station charter exists, that has unlimited uses and
can be used at any time.
/🆑

I think station renaming has to include the special server config tag,
so I've made a global proc to handle that. I have other changes, but
these ones should be uncontraversial.
2017-03-03 18:46:31 +00:00
Joan Lung 20f06bf820 I'm not very smart (#24648) 2017-03-03 11:47:29 -06:00
PJB3005 a63608d023 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-03-03 16:31:00 +01:00
Cheridan d48ce427b6 Merge pull request #24601 from coiax/fixes-puddle-desc
Fixes puddle description
2017-03-02 20:37:11 -06: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
Cyberboss 2a8e5ff4cb Fixes a very annoying spawn (#24588)
* Fixes a very annoying spawn

* Yeah whatever
2017-03-03 10:38:15 +13:00
bgobandit 85621d1e5e You can make a damp rag out of medical gauze + other sink refactors (#24500)
* adds gauze reaction, partially refactors sink water interactions

* Hey guys scarce here

Apparently it takes bandit more than 3 days to make one simple change

* Update watercloset.dm

asdf
2017-03-02 19:48:44 +13:00
kevinz000 4408a8fbdc [READY]Pressure plates - Idea by Arianya (#24319)
* welcome to minecraft

* all good

* fix

* forcemove

* new procs
2017-03-02 19:35:20 +13:00
Joan Lung 3706105960 Fixes brass box hinges (#24533)
* I regret making these a toolbox subtype

* consistency!
2017-03-02 19:31:11 +13:00
oranges 30953aba69 Merge pull request #24534 from Militaires/boxing
fixes boxes that dont use an illustration having writing on them
2017-03-02 19:30:39 +13:00
Jack Edge 692b0027c6 Fixes puddle description
GOD, THIS ANNOYED ME FOR MONTHS, IT'S NOT A SINK, IT'S A PUDDLE.
2017-03-02 02:04:00 +00:00
coiax 27d67a450b Minor implants refactor (#24378)
* Minor implants refactor

Fixes #24375.

Implant cases and implanters now have an `imp_type` var for making the
implant in New(), rather than individually creating the implant in
New(), which would have worked fine except when you try to create
subclasses of implanters.

* Initialize gt New
2017-03-01 13:51:56 +13:00
oranges b322ccc5d4 Merge pull request #24518 from Cyberboss/MineEffects
Fixes mine effect being activated when picked up
2017-03-01 09:14:29 +13:00
militaires 00ce587fb8 boxes 2017-02-27 23:58:59 +03:00
Cyberboss 13b765e633 Fixes null user runtime with station rename 2017-02-27 13:36:10 -05:00
Cyberboss 0a7b9320af Fixes mine effect being activated when picked up 2017-02-27 12:38:51 -05:00
WJohn 299c7d4d52 Merge pull request #24450 from TrustyGun/box_autism
Improves box sprites
2017-02-26 19:45:37 -05:00
coiax 3dee7c96b6 Drone shell changes (#24379)
* Drone shell changes

Fixes #24376.

- Drone shells are now points of interest.
- Derelict drone shells are now just dusty drone shells.

* For GUN_HOG

* Adds ushanka to derelict drones

* Less compiling errors
2017-02-27 12:28:31 +13:00
Joan Lung cd29795b73 Clockwork objects are overall easier to deconstruct (#24424) 2017-02-26 15:31:26 -06:00
Joan Lung d5df752c0e Faction fixes (#24396)
* Faction fixes

* heh

* hup!

* i'm smart
2017-02-27 00:39:01 +13:00
TrustyGun e6cdb313a5 fixes syndie_box 2017-02-25 20:03:25 -05:00
Kyle Spier-Swenson 5ddeb50c29 Fixes progress bars when transferring between storages (#24413) 2017-02-25 17:51:30 -06:00
PKPenguin321 4d7cdce861 fixes paint and paint remover descs (#24417) 2017-02-25 17:49:13 -06:00