Commit Graph

12039 Commits

Author SHA1 Message Date
ZomgPonies 6dbf776ff4 Gamme to shuttle, part two 2014-01-16 06:57:17 -05:00
ZomgPonies 031f67110b Fixes some sounds 2014-01-16 05:23:32 -05:00
ZomgPonies 90909b304a Merge pull request #116 from SamCroswell/master
EXTREMELY buggy Ninja code
2014-01-16 01:52:19 -08:00
ZomgPonies 2f2e6c611f Re-added? Stop drop and roll 2014-01-16 03:47:26 -05:00
d3athrow c8ceab5aa2 Adds Randomized Character Slot, if enabled picks a random populated character slot to use upon round start. Does not affect late joins for now.
Conflicts:
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	html/changelog.html
2014-01-16 00:48:24 -05:00
ZomgPonies b80552169c Stupid type 2014-01-15 13:13:13 -05:00
ZomgPonies 42f286f210 Fixing Gamma armory exploits 2014-01-15 13:06:47 -05:00
ZomgPonies 391cad7d5f Trying to add xenor to traitor panels 2014-01-15 11:56:59 -05:00
ZomgPonies 1caf56a29f Buff pulse rifles 2014-01-15 08:10:40 -05:00
ZomgPonies a99b45a3bd Able to melt decapitated heads into skulls with acid 2014-01-15 08:10:33 -05:00
ZomgPonies d40ebc5cc5 Revert "Tradeband and Gutterspeak now have a different font than Tradeband."
This reverts commit b5906bba39.

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2014-01-15 06:54:46 -05:00
ZomgPonies 3a540cbbce Forgot one 2014-01-15 01:54:21 -05:00
Mark Aherne (Faerdan) c1c49fe6d8 Canister, Tank & Tank Transfer Value NanoUIs.
* Added Canister, Tank & Tank Transfer Value NanoUIs.

Conflicts:
	code/game/machinery/atmoalter/canister.dm
	nano/css/shared.css
2014-01-15 01:53:51 -05:00
SamCroswell 51a4a6ee4f EXTREMELY buggy Ninja code 2014-01-14 23:58:21 -05:00
Incoming 048ed6e9fd [tumblr approved] Sausage Party Reduction
*Lets adamantine golems and ninjas generate female where before they were generated exclusively male.

The ninja spacesuit has a coded in female variant that has existed forever but was not actually used. It only shows up upon suit ACTIVATION because (?:?:?)|\|i|\|j4c0d3(?:?:?).

Likewise female adamantine golems have their own sprites and can show up in staff of change shots, but ones generated from the rune were always male.

This does NOT effect admin summoned unknown humans, those are all still male.

Conflicts:
	code/modules/events/tgevents/ninja.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
2014-01-14 22:55:39 -05:00
ManeaterMildred 671b886564 Added costs for the Mech Ion Rifle and the Mech Rocket Launcher. 2014-01-14 22:43:03 -05:00
ManeaterMildred c016debe54 Added the Mech Ion Rifle, Mech Carbine, Mech Rocket Launcher
and Ion Rifle to the list of things you can build with the
Protolathe and Exosuit Fabricator.
2014-01-14 22:42:50 -05:00
ZomgPonies e8e846400f Extra fixes to secure Gamma armory 2014-01-14 11:08:35 -05:00
d3athrow f16a6a83db clean up the code
Conflicts:
	code/modules/mob/mob.dm
2014-01-14 04:30:13 -05:00
d3athrow bf275e1964 Should fully resolve issue #344
Conflicts:
	code/modules/mob/mob.dm
2014-01-14 04:25:24 -05:00
ZomgPonies 1dc7b05b76 Gibsound changes 2014-01-14 04:17:42 -05:00
ZomgPonies 5ab05ae5ee Compile fix 2014-01-14 00:42:13 -05:00
Rob Nelson 319ae54216 Make some adjustments to catwalks. Fixes #402, #404.
Conflicts:
	code/game/turfs/simulated/floor_types.dm
2014-01-14 00:40:30 -05:00
alex-gh 601c6a9021 Ion storms can actually emag bots now 2014-01-14 00:39:06 +01:00
Hornygranny 95835ac98c Changed neurotoxin from a child of energy to a child of bullet
Conflicts:
	code/modules/projectiles/projectile/bullets.dm
2014-01-13 04:36:15 -05:00
Hornygranny 550d9b2e76 Extra indents removed 2014-01-13 04:27:44 -05:00
Hornygranny 5a443e5010 Replaced spaces with tabs. 2014-01-13 04:27:18 -05:00
Hornygranny 6eefff2c68 Code by Giacom. Changes alien neurotoxin spit to dumbfire.
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
2014-01-13 04:27:08 -05:00
ZomgPonies acb3f37c1b vg's likely superior bot code. 2014-01-13 04:24:16 -05:00
ZomgPonies 2a3620b90f Merge pull request #114 from alex-gh/tweaks_and_fixes
Tweaks and fixes
2014-01-12 23:55:12 -08:00
ZomgPonies d24cdd2f10 Added a gib sound effect 2014-01-13 02:11:15 -05:00
alex-gh 717f6b45be Supermatter no longer irradiates other Z levels 2014-01-13 07:28:43 +01:00
alex-gh 9f2c0b30c1 Roughly halved the chance for spider infestations 2014-01-13 07:21:12 +01:00
alex-gh 998285b64d Slightly tweaked Supermatter to make it a bit more dangerous and a bit less efficient 2014-01-13 07:10:44 +01:00
alex-gh 71a065438d Shuttles outside of SS13 are no longer valid areas for events 2014-01-13 07:03:54 +01:00
alex-gh 1386fc143e Doubled blob spore production rate 2014-01-13 06:36:31 +01:00
alex-gh 8ae4ad268e 'Unidentified Foreign Body' Effect is no longer abtainable through virology, random events can still spawn it 2014-01-13 06:34:16 +01:00
alex-gh cc349de85c Suiciding syndrome actually kills you now 2014-01-13 06:26:38 +01:00
alex-gh a8e73dbef7 Nerfed unstable mutagen rads, buffed radium rads 2014-01-13 06:13:31 +01:00
ZomgPonies 33d1461293 Showing brain part deux 2014-01-12 23:14:35 -05:00
Rob Nelson 55e918cc6a Wire hacking recode from /tg/.
Conflicts:
	baystation12.dme
	code/__HELPERS/mobs.dm
	code/defines/obj/weapon.dm
	code/game/machinery/alarm.dm
	code/game/machinery/doors/airlock.dm
	code/game/machinery/machinery.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/paicard.dm
	code/game/objects/items/weapons/explosives.dm
	code/global.dm
	code/modules/assembly/signaler.dm
	code/modules/mob/living/silicon/mommi/life.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/wires.dm
2014-01-12 22:37:55 -05:00
Mark Aherne (Faerdan) 7fdb4ac503 APC NanoUI
* Created new APC UI
* Tweaked Chem Master UI width.

Conflicts:
	code/modules/power/apc.dm
	nano/templates/apc.tmpl
2014-01-12 21:52:06 -05:00
Mark Aherne (Faerdan) a2049081bf NanoUI Caching and SMES tweaks
* Made NanoUI caching code neater, added check for directories (which are ignored).
* Moved SET to between MIN and MAX on SMES UI.

Conflicts:
	code/modules/nano/nanomanager.dm
2014-01-12 21:29:40 -05:00
Mark Aherne (Faerdan) 06541aecc5 NanoUI assets are now sent to the client automatically.
* NanoUI now finds and sends it's assets to the client (css, images, javascript and templates).

Part of my effort to make creating NanoUIs as simple as possible. This removes the need to add new NanoUI assets (such as templates) to the client send_resources proc.

Conflicts:
	code/modules/client/client procs.dm
	code/modules/nano/nanomanager.dm
2014-01-12 21:28:14 -05:00
Mloc-Argent b907f8f716 Fix for assistants being unspawnable after one enters a cryopod.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-01-12 21:24:19 -05:00
Rob Nelson a971c74d85 Disable nanoUI debugging, for now. 2014-01-12 21:22:56 -05:00
ZomgPonies f3ee81d26c Fix 2014-01-12 21:22:39 -05:00
ZomgPonies 719c254817 Showing brain first pass 2014-01-12 08:42:03 -05:00
Rob Nelson d3c4f0a5e7 New posters from BS12, plus custom poster-loading system that allows dynamic loading.
Conflicts:
	baystation12.dme
	code/game/objects/effects/decals/contraband.dm
	html/changelog.html
	icons/obj/contraband.dmi
2014-01-12 03:45:32 -05:00
ZomgPonies cf79a5f972 Fix puking over skeletons 2014-01-12 00:16:40 -05:00