Commit Graph

3834 Commits

Author SHA1 Message Date
Cheridan 856583d6c5 Merge pull request #24989 from jughu/honeybum<3
Lets you carry honey in plant bags
2017-03-13 14:33:29 -05: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
coiax f1d1e6f5e9 Demotes HANDSLOW to secondary flag (#24878)
It's used in literally four places, it doesn't need a high speed
bitflag slot.
2017-03-13 21:59:48 +13:00
Mike Long f36feb87b5 Lordpidey devil fixes (#24693)
* Devils made via event can no longer ascend.

Admins can control whether or not a devil may ascend via traitor panel.

* Adds logging

* Fixes #21326,     Fixes #21321

* Fixes compile error, removes dead code.

* Moves logging to where it's supposed to be.

* Arch devils can now destroy walls with pitchfork.

* Fixes compile error.

* Summon dancefloor can't be used to break down walls.

* Improves disco floor wall check

* Fixes traitor panel for devils.

* refactors human attack_hand

* Fixes compile error

* Devils now respawn with clothes.
2017-03-12 20:55:36 +01:00
jughu 03886f7d43 Update bags.dm 2017-03-11 18:00:04 +01:00
Lexorion e5e4101f45 gives the bag of holding unique inhands (#24985)
* gives the bag of holding unique inhands

* improves south sprite
2017-03-11 11:17:57 -05:00
Cheridan 4418958f94 Merge pull request #24911 from Supermichael777/Box-meme
Removes the singularity beacon kit from the traitor bundle list.
2017-03-11 02:51:12 -06:00
Joan Lung 7041654243 Removes His Grace ascension (#24909) 2017-03-10 22:36:02 -05:00
XDTM 2f194043e5 Fixes recycled explosive spears (#24857)
* tentadel

* back to normal

* Fixes recycled explosive spears
2017-03-10 23:01:18 +01:00
Lzimann 5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
Supermichael777 c8c6985398 okay 2017-03-09 19:58:35 -05:00
Supermichael777 ff8d971348 Removes the lord singulo box from the memeboxes list 2017-03-09 18:53:33 -05:00
Mike Long e9fe283494 Adds glitter bombs (#24700)
* Adds glitter bombs

* Fixes blue glitter description
2017-03-10 11:44:59 +13: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
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
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
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
PJB3005 64db72a150 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-03-04 16:31:55 +01: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
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
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
WJohn 299c7d4d52 Merge pull request #24450 from TrustyGun/box_autism
Improves box sprites
2017-02-26 19:45:37 -05: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
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
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
danno "big fucking moron" brando 93a49d03e6 danil mubme (#24339) 2017-02-21 15:45:19 -06:00
coiax de0b29dea6 Partially grown clones are horribly disfigured + cardiac arrest refactor (#24106)
add: Refactors heart attack code, a cardiac arrest will knock someone unconscious and kill them very quickly.
add: Adds corazone, an anti-heart attack drug, made by mixing 2 parts Phenol, 1 part Lithium. A person with corazone in their system will not suffer any negative effects from missing a heart. Use it during surgery.
add: Abductor glands are now hearts, the abductor operation table now automatically injects corazone to prevent deaths during surgery. The gland will restart if it stops beating.
fix: Cloning pods always know the name of the person they are cloning.
add: You can swipe a medical ID card to eject someone from the cloning pod early. The cloning pod will announce this over the radio.
del: Fresh clones have no organs or limbs, they gain them during the cloning process. Ejecting a clone too early is not recommended. Power loss will also eject a clone as before.
del: An ejected clone will take damage from being at critical health very quickly upon ejection, rather than before, where a clone could be stable in critical for up to two minutes.
add: Occupants of cloning pods do not interact with the air outside the pod.


After @Cyberboss 's multi-pod cloning got merged, I scrapped the multi-pod stuff from my own work, and brought back the maiming.

Early ejected clones being partially disfigured is a cool feature.

This penalises (but does not completely remove) speed cloning, as there is a window where the clone can be ejected without missing any limbs or organs. Otherwise the clones will probably die due to lack of lungs or heart.

Heart attacks are more lethal, there's an easy medicine for treating them, if chemistry have it on hand.

Clones not reacting to the air around them is a buff to plasmamen (although they'll still burn to death once they're ejected in an oxygen atmosphere).
2017-02-21 11:13:54 +13:00
militaires a9c0e59aba pls 2017-02-20 23:06:05 +03:00
oranges 6c6cda8af6 Merge pull request #24282 from MrStonedOne/patch-314
bumps bluespace ore thingy up to 500 ores
2017-02-20 17:04:21 +13:00