Commit Graph

12467 Commits

Author SHA1 Message Date
Remie Richards eb68aa824e Merge pull request #9777 from KorPhaeron/timestop
Timestop now with webm
2015-06-14 22:27:17 +01:00
KorPhaeron 2e17e01b5f New icon from Remi 2015-06-14 16:18:51 -05:00
AnturK dcee7c356f Minor messages 2015-06-14 21:27:40 +02:00
xxalpha b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +01:00
Cheridan 8f408670a4 Merge pull request #9928 from Ikarrus/Gang_Tweaks
Gang Mode Tweaks
2015-06-14 11:45:55 -05:00
MrStonedOne 7cfff6f1ca Secrets clean up/configurable bomb cap
Moves Secrets to it own file so its not stinking up admins.dm and topic.dm

Makes the bombcap configurable rather then being a per-round only thing.
2015-06-14 09:08:27 -07:00
Cheridan 4f177d1ff5 Merge pull request #9911 from MrPerson/lighting_ai_bugfix
Put the AI's static on top of lighting again
2015-06-14 10:32:36 -05:00
Cheridan 565e4dda5a Merge pull request #9931 from Jordie0608/tfwyougetsocarriedawayyoudontevenachievewhatyousetoutforandhavetomakeasecondprforit
Overlays for computers
2015-06-14 10:25:27 -05:00
MrStonedOne 8079872d35 Makes changing the bomb cap more fine grain
Also changes the other 2 bomb cap values
2015-06-14 07:38:40 -07:00
Jordie0608 a67de221cc JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging 2015-06-14 23:37:35 +10:00
kingofkosmos c8d79e7034 Removed unnecessary spaces in these situations:
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
Ikarrus d59c67ecd0 Squashed commit:
[c9795d3] Writing and formatting tweaks

[65aae64] Tweaks to messages and notices, formatting, and cleanup. (+2 squashed commit)

Squashed commit:

[995a61b] I guess I should call them for what they are (9mm)

[0f04213]   - tweak: "While attempting a Hostile Takeover, gangs do not gain influence. Instead, the takeover timer will be reduced by how many territories they control."
  - tweak: "Tommy guns no longer deal stamina damage."

[202c743] Recruitment Pen cooldown is reduced by 10 seconds for every additional member your rival gang has over yours with a minimum of a 5 second cooldown

[c1a3af3] Pen cooldown = 2 minutes
Fixed gang dominators reporting the wrong time on examine() (+4 squashed commit)

Squashed commit:

[78c043e] Pen Cooldown returned to 60 seconds
Spray can cost halved to 5 influence

[4e65dff] - Capped outfits in stock to 10

[1f347a9] Changelog

[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time) (+2 squashed commit)

Squashed commit:

[1f347a9] Changelog

[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time) (+2 squashed commit)

Squashed commit:

[202c743] Recruitment Pen cooldown is reduced by 10 seconds for every additional member your rival gang has over yours with a minimum of a 5 second cooldown

[c1a3af3] Pen cooldown = 2 minutes
Fixed gang dominators reporting the wrong time on examine() (+4 squashed commit)

Squashed commit:

[78c043e] Pen Cooldown returned to 60 seconds
Spray can cost halved to 5 influence

[4e65dff] - Capped outfits in stock to 10

[1f347a9] Changelog

[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time) (+2 squashed commit)

Squashed commit:

[1f347a9] Changelog

[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time)
2015-06-13 22:13:01 -06:00
Incoming b92f518435 Readds wagging tail feature with WJohn's help on sprites
Changes some sprites to better show off highlighting
2015-06-13 20:34:38 -04:00
Iamgoofball 4de75c539f Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
	code/game/objects/structures/table_frames.dm
	code/game/objects/structures/windoor_assembly.dm
2015-06-13 14:20:17 -07:00
Iamgoofball c2256d41fc BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH 2015-06-13 13:58:08 -07:00
duncathan 9d64ca0e0c makes the game compile
fixes more icon paths
I gave zvent the vent_map icon as a placeholder because it's not like it's even used anyway
2015-06-13 12:33:31 -06:00
AnturK 148c9ec3e4 Minor progress 2015-06-13 15:17:46 +02:00
Jordie0608 3e07dbc5a9 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours
Conflicts:
	icons/obj/chemical.dmi
2015-06-13 20:23:29 +10:00
Jordie0608 5ef93b2225 overlays for computers 2015-06-13 20:07:48 +10:00
duncathan dab13732fe cleans up icon paths; modifies certain unary devices
updates icon paths in multiple files
removed insulated icon state in pipe_item.dmi (insulateds are deaaaad)
lays an icon framework so that o2 generators, cold sinks, heat sinks may eventually be made constructable
  they no longer override update_icon() but instead update like just about every other device
  eventually I'll give these real sprites but given that they're unused it can wait for now
  sprites and construction are outside the scope of this PR
makes heat exchangers update their color based on their node
  because heat exchangers are different sprite-wise they had to override update_icon entirely
makes heat exchanger, heat sinks, cold sinks, o2 generators non-dense
2015-06-13 02:43:17 -06:00
Ikarrus c7ce2cef0e Gang Tweaks
Some tweaks after getting some play tests done.

- Recruitment cooldown increased to 2 minutes
- Gangsters in game modes outside of Gang War cannot recall the shuttle
2015-06-12 21:27:25 -06:00
Razharas ac7da92f5b Merge branch 'master' of https://github.com/tgstation/-tg-station into TrueAuto 2015-06-13 05:30:05 +03:00
Razharas 29730ce479 Merge pull request #9412 from RemieRichards/ReactionaryExplosions
Ports VG's DeityLink's new explosion method
2015-06-13 04:45:23 +03:00
Razharas 486888f801 Merge pull request #9630 from AnturK/vv_assoc
Fixes varediting associative lists
2015-06-13 04:44:24 +03:00
Razharas b7150068cc Merge pull request #9783 from nukeop/master
Adds a chemistry bag for moving large amounts of patches/pills/bottles at once
2015-06-13 04:42:16 +03:00
Razharas 6d0c3840ab Merge pull request #9882 from MrStonedOne/mctweaks
Tweaks MC's dynamic rate system a bit. Lowers lag from singulo getting released.
2015-06-13 04:37:00 +03:00
Razharas 35962f343d Merge pull request #9169 from Xhuis/sorry_goofball
Reverts goonchem, ports baymed, and adds physdesc feature
2015-06-13 04:31:07 +03:00
Razharas 4373f6eece Merge pull request #9904 from xxalpha/runtimesrun
Fixes three runtimes.
2015-06-13 04:29:20 +03:00
Razharas 9b22a123f4 Merge pull request #9891 from Iamgoofball/constructionjunctionwhatsyourfunction
Fixes cloners and portachems not working right with tier 4
2015-06-13 04:26:55 +03:00
Razharas 7902457ec1 Merge pull request #9893 from Iamgoofball/patch-76
removes RNG from emagging cyborgs
2015-06-13 04:25:42 +03:00
Razharas ec6c0465b5 Merge pull request #9879 from Incoming5643/skeleton_man
Magic Mania 1.91: Life's a lich and then you rework the mechanic to be less terrible
2015-06-13 04:24:38 +03:00
Razharas ccf7e02f2c Merge pull request #9909 from Iamgoofball/patch-79
"IT'S ONLY LOGGING, WHAT'S THE WORST THAT COULD HAPPEN???"
2015-06-13 04:15:04 +03:00
Iamgoofball 7b475df05e removes the do_after() from emagging apcs 2015-06-12 15:49:22 -07:00
Iamgoofball a19e95dba5 Removes RNG chance to fail to emag an APC
literally why was this a thing

see the pr that removes it from borgs for reasoning
2015-06-12 14:59:05 -07:00
Firecage 97fc115f0e Fixes spider verbs which I broke. 2015-06-12 13:55:03 +02:00
Ikarrus d2ef043690 Resolved Conflicts:
code/modules/mob/living/living.dm
2015-06-11 23:46:59 -06:00
Ikarrus 351fa89c3a - Renamed tommy guns and made them w_class 5. They're powerful as hell, so they're going to have to be non-concealable. (+3 squashed commit)
Squashed commit:

[acab7ea] - Gang messages distinct between bosses and lieutenants.
- Initial gang points reduced to 25 so they can't buy a pen right away

[140e599] 20 -> 10

[b03fbba] Bulletproof vest + Bugfixes (+1 squashed commits)

Squashed commits:

[b03fbba] Bulletproof vest + Bugfixes
2015-06-11 23:42:08 -06:00
Incoming 595bb0c8e4 Generalizes lizard parts to "features" for future non-lizard fields, at the same time merging mutant color into this list
Random lizard bodies will finally have color!

Pushes features almost all the way to the DNA side of thing, the mob side is only needed during character creation.

Note that changes to the save file will invoke a one time per character runtime for legacy characters as the save file purges mutant_color, this is as far as I can tell harmless, has no effect on the player, and is self correcting.
2015-06-12 00:43:35 -04:00
MrPerson 20a2e98f8d Put the AI's static on top of lighting again
Fixes #9884
Lights are layer 15, for reference. I think they used to be 12.
2015-06-11 20:35:50 -07:00
Iamgoofball 532d992b02 "IT'S ONLY LOGGING, WHAT'S THE WORST THAT COULD HAPPEN???"
famous last words

merge asap
2015-06-11 16:07:22 -07:00
AnturK 951546c624 Whispers Hallucination
Minor Adjustments
Scaling hallucinations
2015-06-12 00:59:44 +02:00
xxalpha 9ba7e6aaf4 Fixes three runtimes.
Better fix. src. purge
2015-06-11 21:30:13 +01:00
Cheridan 7363088cbc Merge pull request #9802 from Miauw62/AyeEye
Nerfs the AI in several minor ways.
2015-06-11 14:13:52 -05:00
Miauw cc05c8f206 Makes AI tracking work. OO-ifies trackability. 2015-06-11 19:33:19 +02:00
Cheridan 96f14d49bf Merge pull request #9806 from kingofkosmos/blendershake
Blender, food processor and gibber shaking when processing.
2015-06-11 10:58:38 -05:00
Remie Richards d72cb4bdf1 Merge branch 'master' of https://github.com/tgstation/-tg-station into ReactionaryExplosions
Conflicts:
	code/game/machinery/doors/poddoor.dm
	code/game/turfs/simulated/floor/plating.dm
	code/game/turfs/unsimulated/walls.dm
	code/modules/admin/admin_verbs.dm
2015-06-11 16:23:45 +01:00
Miauw a881478743 Removes strip_html_properly(), replaces it with html_encode().
It was not as proper as the name would imply, and experience and amused redditors have taught me that writing a proper HTML-scrubbing function is a very hard task indeed.
2015-06-11 15:37:41 +02:00
Remie Richards debb7da66b Merge pull request #9588 from AnturK/build_area
Adds map generators to build mode
2015-06-11 12:50:20 +01:00
Ikarrus 59d9098d26 Gang Update 2015-06-10 23:05:58 -06:00
Razharas 4ce96c52ef Merge pull request #9875 from Iamgoofball/logs
Adds feedback gathering for a hell of a lot more things.
2015-06-11 07:30:57 +03:00