Commit Graph

2370 Commits

Author SHA1 Message Date
LatD
12f9d205e8 Syndicate bomb delay wire changed to one time use (#16790)
* Syndicate bomb delay wire

* Fixes delay wires

* Add bomb delay variables

* Forgot to remove unused var

* Small fix
2016-04-26 23:28:01 +02:00
phil235
6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-26 21:49:51 +02:00
Joan Lung
ad9eec737f Merge pull request #17083 from coiax/ian-looks-very-fashionable-today
Refactors dog clothing
2016-04-25 11:46:44 -04:00
duncathan salt
61ddd6797d Merge pull request #16969 from YotaXP/tgm-maploader
[DNM] Updates the map loader to support TGM style map files
2016-04-25 09:28:26 -06:00
Jack Edge
b9bd58de88 Grammar fixes 2016-04-25 16:28:16 +01:00
phil235
fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-24 21:22:37 +02:00
phil235
0480790b0a Same things but with structures now. 2016-04-24 20:38:33 +02:00
phil235
0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
Jack Edge
a89d951669 Removed whitespace 2016-04-24 15:42:20 +01:00
Jack Edge
1927fc73e6 Dog fashion on the back 2016-04-24 14:40:08 +01:00
Jack Edge
2f26b8eabc Compilation! 2016-04-24 13:54:37 +01:00
Jack Edge
0fd1f3c7e4 Made /datum/dog_fashion 2016-04-24 13:18:43 +01:00
KorPhaeron
fa82df9982 Merge pull request #17035 from LanCartwright/synapviro
Reworks sensory.dm
2016-04-23 15:05:14 -05:00
PKPenguin321
70926d0c7d removes a comment by remie's request
this is the worst commit ive ever made
2016-04-21 16:43:01 -07:00
Akke
dedf15c2c5 Reworks sensory.dm 2016-04-21 19:30:28 +01:00
PKPenguin321
5aadc0494a fixes conflicts 2016-04-18 16:30:16 -07:00
YotaXP
2072670afd Clean up magic numbers. 2016-04-18 18:28:44 -04:00
YotaXP
0d8cc8aee7 Make the loader use ChangeTurf() for turfs. 2016-04-18 17:41:05 -04:00
YotaXP
03d38bf895 Adds a 'measureOnly' mode to the maploader code for templates. 2016-04-18 16:04:35 -04:00
coiax
e7ad4047df Admin-spawn snowflake drone headgear, plus structural changes (#16935)
* Drones spawn with undroppable chameleon helmets

With a random apperance, for SURPRISES.

* Given drones regenerate_icons() proc

This legacy proc is still used by chameleon items, so drones
get one as well.

* Added drone chameleonmasks that can be toggled

Toggle your custom headgear between hat or mask, be the talk of the town.

* RIP default drone camogear

* Moved drone camoheadgear toggle to the item itself

Now we don't need to worry about clogging up the verbs.

* Added drone camo headgear icons

Thanks Nienhaus so much for spriting these.

* Drone camogear now has customised toggle button

As a side effect of this change, I've made a way of overriding the
normal icon behaviour for item related action datums. If you set
an icon state, it'll behave like a regular action datum, and use
that icon.

* Removed unneeded proc call

* Added 'random' icon to actions.dmi

I borrowed the 'slots1' icon from icons/obj/economy.dmi

* Button to randomise drone camogear apperance

That's THREE GUI BUTTONS for the price of one.

* Made "snowflake" drones; start with drone camogear

* Snowflake drone shell dispensers

(Obviously.)
2016-04-18 11:11:10 -04:00
PKPenguin321
866f63d2d4 makes sec gloves way more obvious
1. makes krav maga gloves pathed under black gloves for fire resistance
2. adds sprites for krav maga gloves to hands.dmi and gloves.dmi
3. sets up a var to prevent krav gloves from being cut into fingerless gloves in color.dm
4. makes sec use the new path for krav gloves in security.dm
2016-04-17 21:06:26 -07:00
PKPenguin321
7501ddebf9 krav update
1. actually adds icons that i forgot to commit to actions.dmi
2. makes leg sweep only do weaken(2) in krav_maga.dm, also adds a /sec subtype of krav maga gloves with a more obvious name
3. makes sec start with the /sec gloves in security.dm
4. makes the krav maga implant a toggle instead of giving you krav maga and deleting itself in implant_krav_maga.dm
5. adds my self to admins.txt
2016-04-17 20:15:42 -07:00
Joan Lung
6c16bc874a Merge pull request #16843 from PKPenguin321/krow-macaw
Adds Krav Maga
2016-04-17 00:02:48 -04:00
PKPenguin321
a8d2dfa182 removes experimental tag 2016-04-16 20:31:29 -07:00
PKPenguin321
ac3e7e18dd final style changes 2016-04-16 20:30:18 -07:00
PKPenguin321
bbf696c625 prevents krav maga from being used while incapacitated 2016-04-16 20:01:53 -07:00
PKPenguin321
3dd20078ae big update
removes all counter/blocking related code and the related sound effect
makes krav maga use action buttons instead of verbs
renamed quick choke to lung punch
reduced stun time on leg sweep
removed head elbow, removed the help button (obsoleted by tooltips)
2016-04-15 17:32:05 -07:00
PKPenguin321
2ecb556e94 addresses minor feedback, fixes implant
krav maga implant now works 100%
trailing returns and a useless if() removed
2016-04-14 22:49:29 -07:00
PKPenguin321
c86e390caf adds krav maga 2016-04-12 18:30:14 -07:00
Incoming
6ec39db02a Ruins are now unique, you won't find two of the same one in the same round.
The configurable portion of ruin selection is now a blacklist instead of a whitelist.

Moves Lavaland files to be consistent with Space files.

All ruins are now valid for the sake of template generation (previously lava ones were but space ones weren't.
2016-04-12 17:13:41 -04:00
Cheridan
09db47c94e Merge pull request #16637 from LanCartwright/virosymptomwork
fixes ancient tier bug where stealth 3 advanced viruses were visible …
2016-04-05 23:50:53 -05:00
MrStonedOne
5098a3c884 Made more sleeps use stoplag
This buffs a few things, but makes them handle lag better and tick at the rate of world.tick_lag without causing lag
2016-04-05 11:08:28 -07:00
Akke
e98f0acc27 fixes ancient tier bug where stealth 3 advanced viruses were visible on PANDEMIC. 2016-04-04 23:55:58 +01:00
Isratosh
75b350561a Adding a second argument to mind.transfer_to that forces key movement and fixing rudimentary transformation 2016-04-01 01:32:59 -06:00
Cheridan
6f5b567866 Cleans up some text formatting 2016-03-27 14:13:16 -05:00
Xhuis
cc62b89baf Fix bundle 2016-03-26 15:15:31 -04:00
Iamgoofball
57bae68689 fixes beam() lag 2016-03-20 16:07:48 -07:00
Cheridan
529043d53c Merge pull request #15396 from LanCartwright/sensory
Adds sensory.dm restoration and destruction viruses
2016-03-19 21:07:14 -05:00
Joan Lung
dbc53e0f3d Merge pull request #16136 from LanCartwright/DNAFUCK
Fixes DNA Restore dealing brain damage
2016-03-17 17:48:09 -04:00
Joan Lung
c477cc764c Merge pull request #16108 from Jordie0608/thereareseveralwaysthiscouldbreakbutfortunatelynoneofthemwouldbemyfault
Show-server-revision supports multiple test merges
2016-03-17 17:47:18 -04:00
Remie Richards
f21d675fbe Merge pull request #15849 from Core0verload/jetpack
Jetpack nerf revert, new jetpack implant
2016-03-17 00:59:23 +00:00
Joan Lung
cb3b218f33 Merge pull request #16023 from lordpidey/hud_fix_lordpidey
[S] Removes edge cases of traitors seeing own antag hud upon body switch.
2016-03-15 21:30:30 -04:00
Akke
09a5017529 changes math from (sqrt(20+A.totalStageSpeed()*3))-(sqrt(16+A.totalStealth()*(1+rand())))
to
(M.reagents.get_reagent_amount("mannitol") < 10)
 +		M.reagents.add_reagent("mannitol", 10)
to
(sqrt(20+A.totalStageSpeed()*(3+rand())))-(sqrt(16+A.totalStealth()*rand()))
2016-03-16 00:50:35 +00:00
Akke
c05c6f4d20 -math really fucks with me, especially shit that requires miunses 2016-03-16 00:10:37 +00:00
MrStonedOne
bc8ff11f3f Lag check on initialization (and on a missed del-all proc) 2016-03-15 03:39:43 -07:00
Jordie0608
5115e3e7e0 adds support for multiple test merges 2016-03-14 16:17:19 +11:00
Cheridan
a65f02e917 Merge pull request #15993 from LanCartwright/virologymath
Adds complex math to virology that scales with virus symptom stats.
2016-03-12 23:36:01 -06:00
duncathan salt
e0d3ac1d28 Merge pull request #16050 from Dorsisdwarf/AIlaws
Adds a series of new laws and boards
2016-03-12 15:12:42 -06:00
duncathan salt
1692d5a01d Merge pull request #16022 from AnturK/ruin_fix
Fixes ruins repeating
2016-03-12 13:50:12 -06:00
Cheridan
ece18bc04b Merge pull request #16042 from Jordie0608/thereareseveralwaysthiscouldbreakbutfortunatelynoneofthemwouldbemyfault
Show-server-revision tells if test pr is merged
2016-03-12 11:53:51 -06:00