Commit Graph

5795 Commits

Author SHA1 Message Date
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
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
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
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
Cyberboss
c9eb5b86f0 Fixes the dumbest shit I've ever seen 2017-03-06 15:17:35 -05: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
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
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
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
WJohn
299c7d4d52 Merge pull request #24450 from TrustyGun/box_autism
Improves box sprites
2017-02-26 19:45:37 -05: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
coiax
f7e6327d0a The theme of a chef box is also in the name (#24426)
Previously it was only in the description. Makes it slightly more
obvious.
2017-02-25 17:48:48 -06:00
coiax
82e123a227 Adds plastic, makes plastic flaps constructable and deconstructable (#24257)
* Adds plastic, makes platic flaps constructable

🆑 coiax
add: Cargo can now order plastic sheets to make plastic flaps. No doubt
other uses for plastic will be discovered in the future.
/🆑

Later maybe we can make cable coils use plastic and metal, rather than
metal and glass. And make plastic tables. And make foam darts use
plastic rather than metal. And make spray bottles out of plastic. And
cheap plastic tables. And cheap plastic chairs.

Why? Because plastic makes sense as a material that you can make stuff
out of, and those DAMNED PLASTIC FLAPS AREN'T CONSTRUCTABLE.

* New plastic sheets sprite (STOLEN FROM BAY)

* Making plastic flaps takes time

* Constructable flaps

* Deconstruction time like walls
2017-02-25 15:54:09 +13:00
Robustin
260667bee1 Hulks can no longer use Pneumatic Cannons or Flamethrowers (#24383)
Edit: Gave flamethrowers back to drones #ThanksKor
Edit2: This also includes the species check that locks out ash lizards and golems I think

🆑 Robustin
tweak: Hulks can no longer use pneumatic cannons or flamethrowers
/🆑
2017-02-25 15:52:37 +13:00
Joan Lung
ec226b4836 Moves His Grace's sprites to weapons.dmi (#24332)
* Moves His Grace's sprites to weapons.dmi

* hup

* here's my compromise
2017-02-25 14:42:40 +13:00
militaires
ce34afa14c fixes kommisar konflikts and the final hopefully commit to the purge of non-3/4 boxes 2017-02-24 12:03:06 +03:00
militaires
ac701e9299 Merge branch 'master' of https://github.com/tgstation/-tg-station into more_3/4
# Conflicts:
#	code/game/machinery/cloning.dm
2017-02-24 11:54:55 +03:00
militaires
288e99a194 try again 2017-02-24 11:52:00 +03:00
Kyle Spier-Swenson
bf39570688 Lagchecks removing from storage, reverts bluespace ore satchel limit (#24310) 2017-02-24 16:22:57 +13:00
WJohn
a13a52a98f Merge pull request #24348 from dannno/vendy
Sodie pops
2017-02-23 07:55:34 -05:00
coiax
05026eee88 Taste (#24323)
* Adding taste to reagents

* Toxins mostly taste bitter.

* The taste of medicine is mostly bitterness

* Drugs taste bitter too

* It turns out pyrotechnics mostly taste like burning

* Alcohol and blob tastes

* Drinks taste mostly of drinks

* And the food reagents are the last, but not least

* Actual taste code

* You can now taste freshly spawned carrot cake

* Bread, burgers

* Debugging tasting

* Always add the reagents properly, I guess

* Finally got nutriment scaling working

* Finally got all the stuff working and mixing

* PEOPLE CAN NOW TASTE THINGS

* Mouthful only has one L

* Meat n dough

* Eggs and cakes

* Meat dishes taste of meat

* Others...

* Pastry... there is no end to the food

* PIE AND PIZZA

* SANWHICHES, SALAD, SOUP

* THE LAST OF THE FOODS ARE COMPLETE

* Weird indentation issues fixed

* Remove dat debug code

* Hydroponics and sugar is less strong

* Replaces carrot cake reagents

* Code review

* Fixes bad flavours
2017-02-23 00:59:34 -06:00
Dannno
5536203297 why do we even do it like this, why would we not make them restock the maximum amount possible just by default 2017-02-22 10:47:49 -05:00
MrPerson
f4e768c895 Ion storm improvements (#24223)
* Ion storm improvements

Ion storms have several new additions:
25% chance to flatly replace the AI's core lawset with something random in the config. Suddenly the AI is Corporate, deal w/ it.
10% chance to delete one of the AI's core or supplied laws. Hope you treated the AI well without its precious law 1 to protect your sorry ass.
10% chance that, instead of adding a random law, it will instead replace one of the AI's existing core or supplied laws with the ion law. Otherwise, it adds the generated law as normal. There's still a 100% chance of getting a generated ion law.

All of these stack so you could wind up going from Asimov to Paladin w/o the first law and w/ the last law replaced with THE SHUTTLE CANNOT BE CALLED DUE TO FIVE NINJAS. All the values are easy to tweak if you guys want them higher or lower or whatever.

Custom admin-sent and other fake ion storms (devils) will just add the law and have no chance of doing any of the bonus stuff.

Removed the admin verb to send an ion storm since you can just use the events panel.

Cleaned up some of the law-adding backend. Hopefully there's no double showing of the AI's laws after a lawchange as a result of this.

* Everyday I'm shufflin'
2017-02-22 13:31:04 +01: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
Dannno
b3463d20ce weeeeooooweeoowowowowow i deed it yah wah one up!!! 2017-02-21 20:59:29 -05:00
Xhuis
dd9ef0dd0f Small Highlander patch (#24175)
* Enforces honorable combat

* Now with compiling!

* someBODY once told me the WORLD is gonna roll me

* DOES THE NEEDFUL
2017-02-22 12:00:06 +13:00