Commit Graph
327 Commits
Author SHA1 Message Date
ZomgPonies cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
ZomgPonies 90496be20a Standardized intent names so it's all harm. Fuck you hurt. 2014-01-19 08:30:50 -05:00
ManeaterMildredandZomgPonies 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
SkyMarshalandZomgPonies e2bbbb7e39 Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.
Conflicts:
	code/modules/mining/mine_turfs.dm
2014-01-09 20:56:38 -05:00
YotaXPandZomgPonies b7efb1b7ed Optimized and refactored list2text, text2list, and replacetext.
Also fixed some grammar in the station blueprint code.

Conflicts:
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/admin/verbs/debug.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/ai/say.dm

Conflicts:
	code/modules/admin/verbs/debug.dm
	code/modules/detectivework/scanner.dm
2014-01-08 07:14:16 -05:00
d3athrowandZomgPonies 64d8903802 Following /tg/'s lead, removes set background 1 for smoother gameplay.
Conflicts:
	code/game/objects/effects/glowshroom.dm
	code/modules/mob/living/carbon/zombie/zombie.dm
	code/modules/mob/living/silicon/mommi/life.dm
2014-01-08 01:25:20 -05:00
Mark Aherne (Faerdan)andZomgPonies 5d04a41151 NanoUI updates.
* Simplified the code used in ui_interact procs and updated all current uses.
* Removed ununused jsviews JavaScript code (replaced it with vanilla jsrender).
* Added a message to the UI which shows if JavaScript is disabled (people with JavaScript disabled previously got blank UIs).

Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/reagents/Chemistry-Machinery.dm
	nano/css/shared.css
2014-01-05 23:28:52 -05:00
ZomgPonies aa8fcc9b15 Randomized lawset system + config options 2014-01-05 17:50:13 -05:00
ZomgPonies faa42eb95a Changed floral recipe 2013-12-30 18:34:56 -05:00
ZomgPonies 13666e1086 Remove RnD lockboxes 2013-12-30 18:33:30 -05:00
ZomgPonies a1656037e4 New guns and gun sprites 2013-12-28 10:46:48 -05:00
ZomgPonies af524fef02 New arcade machines 2013-12-28 09:49:00 -05:00
alex-gh 8232841a73 Made message key generation a global helper function. 2013-12-23 07:39:40 +01:00
Iamgoofballandalex-gh 9c628924e5 After a very prolonged set of Syndicate budget cuts, Detomatix PDA carts are no longer buildable 2013-12-11 01:10:14 +01:00
Iamgoofballandalex-gh d8f8838537 made head PDA carts be in lockboxes. Added Abandoned Crates! 2013-12-11 01:09:25 +01:00
Iamgoofballandalex-gh 54f06a1d12 made head PDA carts be in lockboxes. Added Abandoned Crates! 2013-12-11 01:05:26 +01:00
ZomgPonies 8bf368f547 Telescience! 2013-11-04 07:48:43 -05:00
ZomgPonies df12d538ac Merge pull request #19 from Fox-McCloud/Hyrdo+Xenoarch-Tweaks
Hyrdo+xenoarch tweaks
2013-11-02 15:24:39 -07:00
ZomgPonies 05955bb230 Added plasma windows 2013-11-02 04:03:07 -04:00
Fox-McCloud 91026fba82 Hydro+Xenoarch+Sprites
Few changes to Xenoarch finds, adds hydroponics plants, updates a couple
sprites, and removes NT Rep from various traitor lists.
2013-11-01 23:46:37 -04:00
ZomgPonies 7048545d6d Projectile code overhaul 2013-10-30 10:32:21 -04:00
ZomgPonies d31e276cf8 Final XenoArch Fixes (maybe) 2013-10-30 03:33:07 -04:00
ZomgPonies 1fe50a4e13 Bugfixes 2013-10-30 03:13:59 -04:00
ZomgPonies 2df877bf82 Xenoarch update 2013-10-29 11:56:04 -04:00
Fox-McCloud 9a2569f974 Seed Extractor
TG's portable seed extractor, icons, and necessary code for it to work.
2013-10-27 03:29:41 -04:00
ZomgPonies 764f8030a0 New beakers, can wear bed sheets as capes 2013-10-18 04:06:10 -04:00
ZomgPonies 5daf979b72 Pretty much all new click code 2013-10-12 14:44:36 -04:00
ZomgPonies 3bd589289b Xray gun 2013-10-12 14:43:05 -04:00
ZomgPonies 853d490660 Various fixes. 2013-09-27 02:41:41 -04:00
ZomgPonies 643f3faa23 Xenoarch runtime fix 2013-09-26 06:46:48 -04:00
ZomgPonies 900a3526bf poop syndrome in disease and disease2 2013-09-25 06:48:59 -04:00
ZomgPonies 0a0c2c79f9 Framework for Job Objectives 2013-09-17 14:27:25 -04:00
ZomgPonies 9580552fd3 Re-added ninjas 2013-09-16 22:34:28 -04:00
ZomgPonies b3aadbf02e Added some /tg/ random events 2013-09-10 15:10:26 -04:00
ZomgPonies c1222034ee BS12 -> Ponies merge 2013-09-09 10:51:16 -04:00
ZomgPonies a935863200 Made blob gamemode work, removed ninjas because needs overhaul, optimized some strings 2013-09-08 11:39:33 -04:00
Mloc-Argent a084f74c7d Expansion of every "icon = ''" path.
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-09-01 21:53:36 +01:00
Zuhayr 0f0ac218b3 Commented out blob and wish granter. 2013-08-03 12:51:41 -07:00
Segrain 914d072c86 Camera networks. 2013-07-28 00:58:18 +03:00
Mloc-Argent 75c8f6d76a Merge branch 'BEF-staging' 2013-07-08 23:28:22 +01:00
Segrain 82c3e6aa8c Fix for #3255. 2013-07-06 16:51:59 +03:00
Segrain 6804cf0518 Fix for #3254. 2013-07-06 16:50:01 +03:00
Mloc-Argent 08393161c0 Merge branch 'master' into BEF-staging
Conflicts:
	config/config.txt

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-04 13:08:28 +01:00
Ispil 4c1bb073ff Fixes issue #2872, partially. Carp are now smashed by shuttles if they don't get pushed out of the way. However, they can still end up in grille-windows, giving more motivation to replace them in shuttles with actual shuttle windows. Also gibs other simple_animal creatures that are in the way. 2013-07-04 04:55:24 -07:00
Spamcat 11e27c5999 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops
Conflicts:
	code/game/gamemodes/objective.dm
2013-07-01 19:49:29 +04:00
Spamcat 10ee1fbcfe World loops 2: Electric Boogaloo. 2013-07-01 19:43:56 +04:00
Zuhayr 8eec1d5379 Fixes #3008 2013-06-27 06:30:17 -07:00
Cael Aislinn de91fba835 halved the length of xenoarch scans, scans actually shut down when they exceed the safety by too much
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-06-23 10:27:48 +10:00
Cael Aislinn 73cf13745d depth scanner should now properly show the responsive material of a find
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-06-23 10:25:41 +10:00
Cael Aislinn 6ccaae583f excavation gear belts can now hold pick sets, pick sets can no longer hold hand picks (they spawn in the locker instead), picks and measuring tapes now work much faster
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-06-23 10:25:16 +10:00