Commit Graph

1106 Commits

Author SHA1 Message Date
Krausus
1389f0eb9b A couple istype->ishuman replacements 2015-06-10 11:02:54 -04:00
Krausus
222215880c Fixes traitor panel "undressing" organs 2015-06-10 10:44:35 -04:00
Krausus
a7eea3487f Fixes missing/broken admin permission checks
Also fixes a small issue with the permissions panel, because the error
message was really annoying me.
2015-06-08 07:55:29 -04:00
ZomgPonies
88c5d1a4ac Merge pull request #1136 from tigercat2000/spbook
Spellbook overhaul
2015-06-07 14:11:14 -04:00
Krausus
f4ee808e6a Fixes adding/removing null languages through VV
These would attempt to add/remove null languages if the language
selection was canceled.
2015-05-30 03:31:15 -04:00
Krausus
d7260c87b9 Fixes admins disabling shadowlings/thralls
Fixes the Shadowling Hivemind language being entirely deleted and
shadowling abilities not being removed
2015-05-30 03:23:47 -04:00
ZomgPonies
277a900aa7 Merge pull request #1193 from Fox-McCloud/mobs-pets-stuffs
Simple Animal Refactor+Update+Fixes and Pet Collars
2015-05-28 22:45:03 -04:00
Fox-McCloud
cd112b5364 Wolpin Fix+Monkey Tail Fix 2015-05-28 04:04:39 -04:00
Fox-McCloud
5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -04:00
ZomgPonies
264369bdfa issmall fixes and order of operations 2015-05-25 23:50:53 -04:00
ZomgPonies
1935a82afe 2/3 of port done 2015-05-25 19:48:13 -04:00
ZomgPonies
f2d03e93c2 First 1/3 of port done. 2015-05-25 17:59:30 -04:00
ZomgPonies
41bc4eed31 Merge pull request #1156 from Fox-McCloud/spess-dogs
New Race: Canine Race--Vulpkanin
2015-05-25 04:43:04 -04:00
ZomgPonies
f3195c3c6e Merge pull request #1148 from Fox-McCloud/speciesist
Removes Speciesist Objective
2015-05-24 10:18:49 -04:00
Fox-McCloud
791ebc0b7f New Race: Canine Race--Vulpkanin 2015-05-24 01:00:19 -04:00
Fox-McCloud
904c4c62c9 Removes Speciesist Objective 2015-05-23 03:25:44 -04:00
AnturK
7c590aedd3 Spellbook overhaul
Contains Commits:
 - Spellbook Refactor <AnturK/-tg-station@6380f67>
 - Splits the Spells into Offensive/Utility <AnturK/-tg-station@25ba9fb>

More or less a complete overhaul of the spellbook to a datum based system.
2015-05-22 06:43:21 -07:00
PJB3005
4e24dba5c1 SM-TeG best engine. 2015-05-22 01:48:54 +02:00
ZomgPonies
864a7d70f3 Merge pull request #1105 from Fox-McCloud/LINDA-gas-defines
LINDA--Updated Gas Datums and Atmospheric Defines
2015-05-20 06:52:10 -04:00
Fox-McCloud
0a4ea0b326 LINDA--Updated Gas Datums and Atmospheric Defines 2015-05-18 20:10:30 -04:00
Tigercat2000
a8702efd6b BAYPORT: Duct Tape
This commit ports Duct Tape from bay, alongside a few other changes for
our own code.

Bay12 Features:
 - You can tape paper to.. anything basically, like a sticky note.

Changes from Bay12:
 - Tape is a stack now, and has 10 uses per roll.
 - The guitar recipe now calls for 5 pieces of tape.
2015-05-17 14:11:25 -07:00
ZomgPonies
59ed4f69ad Merge pull request #1080 from tigercat2000/WHYDOTHESEKEEPSWITCHING
FIX: Attack logs being backwards
2015-05-16 07:52:33 -04:00
Tigercat2000
b7e5aa5597 FIX: Attack logs being backwards
This commit fixes attack logs being backwards on some erroneous add_logs
arguments.

Things fixed:
 - Martial arts
 - EMP Flashlight
 - Defibrillator
 - C4
 - Handcuffs
 - Resonant Fields
 - Alien Larva attack_animal
 - Mobs being grabbed
2015-05-16 04:41:37 -07:00
ZomgPonies
6bfd92b16a Merge pull request #1061 from FalseIncarnate/wizard
Brooms, Stick-horses, and Flying Wizards!
2015-05-16 07:34:22 -04:00
FalseIncarnate
5cbd09f593 More Brooms and Horsemasks and Jerseys
Adds 2 Horsemasks to the AutoDrobe's hacked items list.

Adds 2 new crates to cargo: Team Jerseys Crate and Polo Supply Crate.
- Team Jerseys Crate (15 supply points) contains 4 red jerseys, 4 blue
jerseys, and 1 beach ball
- Polo Supply Crate (20 supply points) contains 6 brooms, 6 horse masks
(to put on the brooms), and 1 beach ball

Adds new jerseys: an alternative to athletic shorts that come in red and
blue. Red team is the NT Phi-ghters, Blue is the NT Pi-rates. Show your
team spirit today!
2015-05-16 04:14:08 -04:00
Fox-McCloud
8a5e3663df Fixes and Tweaks 2015-05-15 21:58:24 -04:00
Fox-McCloud
517f44afdc Nuke Ops Uplink Fix 2015-05-15 18:33:29 -04:00
FalseIncarnate
55087890de Brooms, Stick-horses, and Flying Wizards!
A port of https://github.com/d3athrow/vgstation13/pull/4377

![image](http://i.gyazo.com/dd415093be904dc9e5d40570598eddb9.gif)

Allows brooms to be wielded with 2-hands. Doing so places the broom
between your legs so you look like you are riding it.

You can also put a horsehead mask onto the broom to create a stick-horse
to ride. This can also be wielded, but will ALWAYS appear between your
legs.

And for the more magically inclined, wielding a broom or stick-horse (2
hands!) will cause you to ride it like a witch, giving you the ability
to bypass hazards such as tables and banana peels.
2015-05-15 03:52:36 -04:00
ZomgPonies
b9420c61f7 Merge pull request #1035 from tigercat2000/LoyaltyTraitorStuff
Antag picker fairness
2015-05-14 09:05:27 -04:00
Incoming
1bbff5abfe All modes now choose their antagonists before they choose jobs.
A new mind attached list, restricted_roles, will keep incompatible jobsout of rotation.

Players who would otherwise qualify to play as a protected role will spawn
as the most wanted not protected role they qualify for if they are an
onstation antagonist. If they don't qualify for any job in this way
depending on preferences they will either spawn as an assistant or a random
job (which also makes sure they don't end up in an incompatible job).

Note this doesn't impact late join antagonists or mulligan antagonists.
Roundstart only.
2015-05-13 06:14:00 -07:00
Tigercat2000
993ad208a8 Overhaul global defines and vars
This commit overhauls the global.dm file, global_lists.dm file, and
defines.dm file into a tree system based on -tg-.

All defines have been split and distributed in code/__DEFINES/

Everything from global.dm and global_lists.dm has been split and
distributed in code/_globalvars

The _compile_options.dm file contains anything that absolutely, 100%, must
be initialized before world.dm.

Name definitions have been moved to code/_globalvars/lists/names.dm.

Other things to note
 - All instances of something.z == 2/1/3/5 have been replaced with easily
   configurable defines, labeled ZLEVEL_. The map include file can
   override these by defining custom ones in it's file, as it is at the
   top of the tree.
2015-05-12 20:48:38 -07:00
Tigercat2000
fd4b35fced GAABS: Fix a few missing icons 2015-05-11 09:51:46 -07:00
AnturK
568d289a67 Generic Action\Action Button System
This commit ports the GAABS from -tg-station13. The GAABS allows for
generic, movable, hud elements for spells, powers, and items.
2015-05-11 09:32:08 -07:00
ZomgPonies
23b2fac794 Merge pull request #980 from FalseIncarnate/master
Botany / Xenobotany Update [Feature][Sprites]
2015-05-10 16:05:57 -04:00
FalseIncarnate
db9d9fc647 Botany / Xenobotany Update
Largely a port of https://github.com/Baystation12/Baystation12/pull/8038
(Credit to Zuhayr for his hard work on botany)

Breakdown of the port:
- Plant traits have been expanded drastically
- You want a bio-luminescent tomato that explodes into a cloud of acid
when thrown or stepped on? Or maybe a corn vine that entangles people
and injects them with mannitol and it's harvests that can be used as a
battery? Totally possible.
- Adds new random seeds! Replaces the egg-plant seed in the exotic seeds
crate from cargo with 2 of these.
- Literally random, they have randomly generated stats, chemicals, and
traits. Great for researching, and/or wasting cargo's supply points.
- Plant analyzers can now print off the last scan they recorded, meaning
you can distribute copies of the report to validate your claims of
having the dankest weed on station.
- Potatoes, carrots, watermelons, soybeans, and pumpkins can all be
sliced/diced/carved with ANY sharp object, such as knives, hatchets,
glass shards, and e-swords.
- This should give the chef a bit more room to make it look like he
actually is doing the work by slicing up fries by hand. The processor
still also works.
- New reagent: Wood Pulp
- Currently has no use in recipes, but any plant with this reagent in it
can be chopped into planks with a hatchet. Did someone order some
Ambrosia Deus planks?
- Also, vines with woodpulp are dense. You have been warned.

Now onto the stuff I did in addition to the stuff from Bay.
- Fixed typos where plasma was mistakenly called "phoron" in the port.
(Sorry bay)
- Replaced bay's botany mutation chances with our tiered mutation
system.
- Re-re-added tobacco, space tobacco, tea aspera, tea astra, coffee
arabica, and coffee robusta.
- Re-enabled the rolling of joints
- Made it possible to hand-roll cigarettes from tobacco / space tobacco.
(A requested / promised addition)
- Just like with joints, it will inherit any chems in the tobacco, has
the same reagent capacity as a joint, but looks and smokes like a cig
(lasts as long as the cigarettes) with a different name/description to
differentiate it from pre-made cigs.
- Corn can now be juiced in the grinder, in addition to grinding it.
Grinding corn will result in it's contained reagents (like corn starch),
while juicing corn will result in corn oil.
- Re-added the additional plant analyzer information when scanning trays
(displays age, weed level, etc)

Also cleaned up the recipes_microwave.dm file, removing the commented
out recipes that were distributed to the other machines during the
Kitchen Overhaul. Shortens the file a bit and makes it more readable.

I probably forgot stuff, so I will add things as I remember them / they
get pointed out.
2015-05-09 06:00:24 -04:00
TheDZD
6515b10ccc Merge pull request #963 from ZomgPonies/superhero2
Superhero Overhaul Part 2: Magnetic Boogaloo
2015-05-08 16:55:59 -04:00
Fox-McCloud
b20104b360 Various Fixes and Tweaks 2015-05-07 23:31:39 -04:00
ZomgPonies
bfb997f3d2 Gave EN a prototype magnetic spell 2015-05-07 20:51:47 -04:00
ZomgPonies
f6c55407c2 Removed invocation from LightnIan power 2015-05-07 00:41:03 -04:00
ZomgPonies
82730e9b4a Fix broken admin commands 2015-05-07 00:26:26 -04:00
Fox-McCloud
828e3c9927 Merge pull request #952 from ZomgPonies/superhero
Massive Superhero Update
2015-05-06 23:40:08 -04:00
Fox-McCloud
e004610827 Merge pull request #956 from TheDZD/shadowling
Shadowling Fixes
2015-05-06 18:18:28 -04:00
ZomgPonies
2beaae7734 Added admin commands to make people superheros 2015-05-06 02:33:58 -04:00
DZD
a769b4fc39 Shadowling fixes
- Fixes shadowling thralls not showing up on Check Antagonists.
- Also adds vampire thralls to Check Antagonists
- Fixes shadowlings not turning off hardsuit helmet lights.
- Fixes transforming into a shadowling dropping organs.
- Adds job such as blueshield, NT rep, and pod pilot to the list of jobs
that cannot be shadowlings.
- Remove ascended shadowling commune, transfers the shadowling's
languages to the ascendant instead.
- Fixes intercept not being sent to the station on shadowling rounds.
2015-05-05 21:44:44 -04:00
ZomgPonies
43981fb34e Added lightning spell to wizards 2015-05-05 20:54:57 -04:00
ZomgPonies
2cb22ac647 Finished adding LightnIan and the spells datum stuff 2015-05-05 19:52:38 -04:00
ZomgPonies
0e3b3edd29 Added the wizard lightning spell, NOT to wizards for now 2015-05-05 19:12:49 -04:00
ZomgPonies
d106462fa5 Merge pull request #796 from TheDZD/shadowling
Port of /tg/station's Shadowlings [WIP]
2015-05-04 20:38:20 -04:00
DZD
7e99d67587 Fixes runtimes
YES YES!
2015-05-03 16:58:32 -04:00
Fox-McCloud
5aada8a9a3 Merge pull request #906 from Krausus/NicotineAddiction
Cigarette Fixes/Tweaks
2015-05-02 23:29:49 -04:00