Commit Graph

14295 Commits

Author SHA1 Message Date
Jordie0608 34fb8cc8bc toggle nuke and set sec level button, flamethrower logging 2015-06-16 17:19:56 +10:00
Cheridan 7aba70ecf3 DRAGnet lives! 2015-06-15 23:55:28 -05:00
Ikarrus 210cc17d5c Loyalty Implants and Gang Mode
Security treating gangs like revs has had a very negative impact on the experience of gang rounds. With an easy and convenient deconversion method, gangs are easily stomped as they rapidly run out of members to convert. So I'm going to try something different and see how things go if implants in gang mode acted as they are in cult.

- Implants can still prevent conversion, but can no longer deconvert or identify gangsters
- If a recruitment pen fails, the error message the gang boss receives will distinct loyalty implanted individuals from enemy gangsters.
2015-06-15 21:39:21 -06:00
Orange Borg e3580e4746 PSHOOM
PSHOOOOOOOOOOM
2015-06-16 13:04:47 +12:00
Incoming 9ac391d780 hotfix for character save compatibility with the features system (aka custom lizards)
I thought you could store a list in a save file

Nooooooooope
2015-06-15 19:20:50 -04:00
phil235 63a68a97b2 Nerfs xray gun by giving it a shorter range that gets shorter if it hits things.
Make vault airlock more explosion resistant (explosion_block var).
2015-06-15 20:53:28 +02:00
GunHog fd27d9d3bb Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE
Conflicts:
	code/game/gamemodes/malfunction/Malf_Modules.dm
2015-06-15 12:26:28 -05:00
GunHog bc11259282 Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE
Conflicts:
	code/game/machinery/computer/aifixer.dm
2015-06-15 11:27:11 -05:00
Remie Richards 9361c5efcd Merge pull request #9973 from KorPhaeron/thirdtimesthecharm
Slaughter Demon
2015-06-15 17:25:01 +01:00
phil235 ae8c69f9a7 Merge pull request #9955 from kingofkosmos/spanspaceremoval
Unnecessary space removal from spans and messages
2015-06-15 18:20:04 +02:00
phil235 d0ac668271 Merge pull request #9676 from Jordie0608/ironicthatonehumanisasectorzerolaw
Fixes #2878, Zeroth laws can be removed with core boards
2015-06-15 17:44:46 +02:00
phil235 1e8ec967d3 Fixes a runtime with staff of change changing species. 2015-06-15 17:12:23 +02:00
phil235 d275152a96 Fixes the wizard magic mirror race change.
Fixes the "race swap" wizard event.
2015-06-15 17:01:07 +02:00
Razharas 2d223b15f6 Merge pull request #9702 from KorPhaeron/armor
Lowers Armor Values
2015-06-15 17:49:40 +03:00
KorPhaeron ce933a1a97 Slaughter Demon (again)
Had to recreate because I couldn't resolve the merge conflict.

New side event/antagonist. Simple animal that can use pools of blood as
portals to move around the station. Spooky scary.

-CtrlClick on an adjacent blood pool (or turf with blood on it) to
"enter" (start an infinite duration jaunt
-CtrlClick on a blood pool while jaunted to exit at that pool
-If you're pulling a mob while you enter a pool, the mob gets pulled in
with you, and you devour them, healing yourself
-Night vision

Adds an event (admin only) that spawns one.

Adds wizard item for summoning it. Has objective to kill the wizard (and
everyone else).

Also fixes typo/filepath for the scrying orb in the new wizard datum
thing.

If someone could help me with mind stuff so I can track how many people
it eats that'd be great.

Webm

http://www.singulo.io/tg/src/1433549232359.webm
2015-06-15 09:41:03 -05:00
Dorsisdwarf 1b84fccf72 Adds sudukdudu pens 2015-06-15 13:41:31 +01:00
phil235 aaf8f2893f Merge pull request #9922 from Iamgoofball/patch-80
Removes RNG chance to fail to emag an APC, along with the emag delay
2015-06-15 14:16:55 +02:00
Jordie0608 8fc003029c Merge branch 'master' of https://github.com/tgstation/-tg-station into ironicthatonehumanisasectorzerolaw
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
2015-06-15 16:34:56 +10:00
KorPhaeron 99735ea50d New floors from xenobio/new var for turfs
Turfs now have a slowdown var that will determine how fast mobs move on
it.

Bluespace slimes can now create bluespace floor tiles which give -1
slowdown using blood

Sepia slimes can now create sepia floor tiles which give 2 slowdown
using blood

Camera and film reactions merged into a single water reaction

Bluespace crystal reaction moved to plasma
2015-06-15 01:33:00 -05:00
Jordie0608 7279c504c2 fixes server console icon 2015-06-15 14:42:47 +10:00
Cheridan 50686d2200 Merge pull request #9966 from KorPhaeron/timestop
Added new timestop sound from Cuboos
2015-06-14 19:45:17 -05:00
KorPhaeron 6bbc2141ff Added new timestop sound from Cuboos
ZA WARUDO
2015-06-14 19:26:03 -05:00
phil235 2e7ddc1f45 Merge pull request #9053 from MrPerson/screen_alert_2
More screen alerts
2015-06-15 01:00:20 +02:00
phil235 c0f848250d Merge pull request #9798 from Aranclanos/disposals
minor disposal fixes
2015-06-15 00:45:05 +02:00
Iamgoofball a00e11520c Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics 2015-06-14 15:42:15 -07:00
Cheridan ec8cd61d4c Merge pull request #9808 from Incoming5643/march_of_the_snowflakes
WJohn's Hyper Customizable Lizard Sprites
2015-06-14 17:40:20 -05:00
Cheridan b584d55826 Merge pull request #9918 from Firecage/Spiderfix2
Fixes spider verbs which I broke.
2015-06-14 17:15:31 -05:00
phil235 d657030e8e Merge pull request #9628 from spasticVerbalizer/droneQuickEquip
Adds quick-equip verb for drones
2015-06-14 23:28:51 +02:00
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