Commit Graph

108 Commits

Author SHA1 Message Date
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Neerti
af5c633cdb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob
# Conflicts:
#	code/game/atoms_movable.dm
2017-11-29 22:43:05 -05:00
Neerti
acb208dd3f Works on New Blob 2017-11-29 22:35:01 -05:00
Neerti
7497aef295 work 2017-11-26 12:08:05 -05:00
killer653
2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
Anewbe
aa6866bf44 Merge pull request #3684 from Cyantime/detables
Reduces effectiveness of tabling as opening combat move.
2017-09-15 21:55:50 -05:00
killer653
bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
Mechoid
98af877b21 Xenomorph Tweaks/Buffs. 2017-09-06 13:37:43 -07:00
Cyantime
5b9cf75355 Tabling nerf reduction(?) 2017-08-07 21:34:34 -04:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Cyantime
b9e3e0e57e Nerfs tabling 2017-08-06 02:36:23 -04:00
Neerti
99eb6f9404 Updates Tools
Adds toolspeed var, which is a multiplier on how 'fast' the tool works.  0.5 means it goes twice as fast.
Adds usesound var, which determines what sound is used when a tool is being used.
Changes a lot of code to use those two vars instead.
Adds 'ayyy' tools, which are ported from /tg/'s abductor gamemode.  They're currently admin only but I might make them obtainable by xenoarch later.
Adds powertools, also from /tg/.  CE starts with them in a new toolbelt that spawns in their locker, ported from (you guessed it) /tg/.
Changes welder sprites to look nicer, ported yet again from /tg/.  Modified the blue welder slightly so it can be the electric welder sprite.
Adds various sounds from /tg/, for tools and welders.
2017-08-03 04:49:23 -04:00
Leshana
18b1828631 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170630 2017-06-30 22:31:43 -04:00
Neerti
470c80e8eb Merge pull request #3448 from Anewbe/ling_claws
Adds ling claw power
2017-06-20 00:54:23 -04:00
Leshana
5a02b7e5c7 More and more Destroy() cleanups all across the board - Return qdel hints. 2017-06-10 22:41:51 -04:00
PsiOmegaDelta
7b47590645 Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-10 22:41:51 -04:00
Leshana
e48b548f2b More and more Destroy() cleanups all across the board - Return qdel hints. 2017-06-05 23:01:41 -04:00
PsiOmegaDelta
ebe5cc916d Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-05 22:10:06 -04:00
Leshana
197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
Neerti
a0a390e887 Surgery Modifications
Semi-rewrites how surgery failure works.  Using an improper surface will call the surgery step's fail proc instead of just doing a melee attack.
Adds 'surgery odds' var to objs, which determines effectiveness.  The numbers for operating tables/roller beds/tables remain unchanged from the previous version, however doing it this way makes it cleaner to add new surfaces in the future.
Adds a proc to get a surgery surface.
Also makes burn repair on FBPs more efficent, so that one scorched robot does not take literally all of robotic's wires.
2017-05-31 17:41:02 -04:00
Arokha Sieyes
036af69b78 Table Iconstate Cache
Adds the table iconstate cache because it was super silly to make so many images.
2017-05-15 22:38:53 -04:00
Leshana
6386b01c1b Fix tables double initializing during system boot.
* During master controller inits every object, so we don't need to propagate to neighbors, they will be initialized too.
2017-05-15 22:34:41 -04:00
Anewbe
ee0a8b7fbe Adds ling claw power 2017-05-15 15:51:21 -05:00
Leshana
ca2b1a269e Change back to original table icons. 2017-05-09 01:09:04 -04:00
Arokha Sieyes
03f80e59ab Tether 1,3 work, and Tables 2017-05-07 15:56:28 -04:00
SinTwo
afb6f1b572 Fixes: #3268 2017-04-10 23:32:38 -04:00
Anewbe
14b9f7ce79 Adds bench presets 2017-03-24 22:46:43 -05:00
woodratt
19fb047f01 WR_SC_Map_Changes
- Fixes sprite issues with departmental intercoms.
- Tweaks to the random objects dm
- Copies Bay's flora and warning sign list, as well as ports some of their signs.
- Addition of a couple new floor decals.
- New table preset, wooden reinforced.
2017-03-08 17:44:48 -08:00
SinTwo
a7aa2a7f33 makes benches a subtype of tables 2016-06-29 17:52:27 -04:00
SinTwo
86e500d25c Adds floor lamp, benches, new tank sprites, and cup dispenser on water coolers. 2016-06-19 22:28:01 -04:00
Yoshax
f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
Zuhayr
f93ea6a78f Tweaks to previous commits.
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
2015-12-24 21:13:40 +10:30
Neerti
a9dda6cf3f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
Conflicts:
	.travis.yml
	code/game/gamemodes/cult/cult.dm
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/ninja/ninja.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/gamemodes/wizard/wizard.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/objects/structures/lattice.dm
	code/global.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/reagents/Chemistry-Recipes.dm
	config/example/config.txt
	polaris.dme
2015-09-06 18:26:06 -04:00
GinjaNinja32
a286bd24b4 improve defines in table code
the defines were inverted, this uninverts them
also fixes #undef of old names for things
2015-08-28 00:12:18 +01:00
Neerti
00fa623c9d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme
2015-08-23 01:30:46 -04:00
Neerti
ecaf6758df Begins work on new ling. 2015-08-20 11:38:48 -04:00
Zuhayr
f6df7df714 Added diona gestalt preset. 2015-08-13 16:59:37 +09:30
GinjaNinja32
477a9b8dba Merge remote-tracking branch 'upstream/dev' into client_dir 2015-08-13 05:55:05 +01:00
HarpyEagle
fc7e89380e More material renames
Gives several materials shorter and easier to type names, updating the
display_name where applicable. Also fixed a slightly mismatched variable
type.
2015-08-07 17:10:35 -04:00
GinjaNinja32
d050606665 Changes tables to rotate correctly with client.dir 2015-08-02 15:03:42 +01:00
mwerezak
0ceb0e291d Fixes #10314
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
2015-08-02 00:01:10 -04:00
Kelenius
3de25ceb00 Fixes #8161 2015-07-15 16:34:05 +03:00
GinjaNinja32
3b13199425 Fixes tables not connecting 2015-07-11 23:19:57 +01:00
Chinsky
5b627cc763 Fixes #9939 2015-07-09 23:07:28 +03:00
mwerezak
0d6dfd899a Makes standard tables plastic
Makes standard tables plastic, readds steel tables to various places,
mainly around engineering and maintenance. Makes shuttle tables
reinforced.
2015-06-14 13:38:56 -04:00
mwerezak
e510f6625f Fixes IV stands blocking bullets
IV stands now check PASSTABLE, allowing projectiles and small mobs to
pass through them.

Flipped tables now block small mobs.
2015-05-26 23:05:38 -04:00
Zuhayr
93b014c699 Merge with dev. 2015-05-20 13:39:31 +09:30
GinjaNinja32
cda71446eb Fixes #9341 2015-05-18 07:10:37 +01:00
Zuhayr
a540e97e1b Stool and table tweaks, adjusted tables on the map. 2015-05-17 13:41:22 +09:30
Zuhayr
358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30