Commit Graph

354 Commits

Author SHA1 Message Date
NanakoAC
78c8951030 Cyborg beakers and grippers (#338)
* Fixing Borg Beakers

*Crisis and Research borgs now have a Chemistry Gripper instead of a
beaker. The gripper can hold beakers, bottles, pillbottles, pills, hand
labellers, and phoron crystals
2016-05-31 01:09:31 +03:00
skull132
3f1416e2e5 Fixes #179
Merge pull request #11121 from Dennok/patch-1
2016-03-25 16:52:49 +02:00
Ccomp5950
bd60099a7e Removes unused pressure_resistance variable.
This is used with FEA not ZAS

Though it's kind of funny to look at what some of these values were set at.
(For reference: ONE_ATMOSPHERE = 101.325)
2016-02-03 18:17:52 -05:00
Chinsky
9a156c56de Merge pull request #11513 from Karolis2011/Constructable_Cargo
Constructable Cargo
2015-12-19 09:18:45 +03:00
Zuhayr
1ab263f662 Rewrote targeting. 2015-12-16 10:10:13 +10:30
PsiOmegaDelta
12078c48e9 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/__defines/mobs.dm
	code/game/asteroid.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/recycling/disposal.dm
2015-12-13 10:47:33 +01:00
SkyMarshal
a97da84b18 Fixes #11093
Also fixes a runtime error trying to disposal monkeys and the like.  It was doing a type check too late.
2015-12-11 21:32:00 -07:00
SkyMarshal
02d1a875d1 Fixes #7075
Disposal holders will now be emptied if they get expelled from a disposal pipe, instead of sitting there hoarding their contents.
2015-12-11 18:26:52 -07:00
Karolis2011
1774743f24 Made part of recycling code to use atom.forceMove() and
fixed minor bugs:
Delivery chute deconstruction use no fuel.
2015-12-10 19:53:42 +02:00
Merchoven
0fbc298616 Fix for disposal pipes not vanishing under floors.
This is a fix for issue #291. Disposals pipes should now properly stop
displaying when a floor is placed on top of them.
2015-12-04 09:58:08 +01:00
Karolis2011
551df1bb97 Few Fixes
Made destination tagger window bigger.
Added user checks.
2015-11-24 11:50:25 +02:00
Karolis2011
70245abe20 Made conveyors constructable and linkable with switches, but
currently there is no way to obtain new conveyors or switches
2015-11-23 11:55:08 +02:00
Karolis2011
ee79020cb8 Added option to enter custom destination to tagger and
Made code to look closer to today's code standarts
2015-11-23 11:53:28 +02:00
Dennok
536a3a6070 fix #10882 2015-09-16 14:34:20 +03:00
SkyMarshal
772c320303 Multi-Z. 2015-08-30 14:15:20 -07:00
GinjaNinja32
111400505d Conveyors, signs, door buttons and crematoriums will now rotate correctly with client.dir 2015-08-18 15:48:55 +01:00
Zuhayr
3b712adb5f Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes. 2015-08-16 17:51:19 -07:00
Kelenius
d8d94b9d64 Merge branch 'dev' into ofSleepersAndNano
Conflicts:
	code/game/machinery/Sleeper.dm
	maps/exodus-1.dmm
2015-08-13 09:20:51 +03:00
PsiOmegaDelta
8ca5d01dcf Crematorium Destroy()
Adds a missing Destroy() for the crematorium tray.
Changes X.loc = loc into X.forceMove(loc).
2015-08-06 08:39:24 +02:00
Karolis2011
a38ac6c8b7 Fix for invisible tagger pipes 2015-07-30 12:37:10 +03:00
Kelenius
f948932bee Updates sleepers
WIP
2015-07-29 11:17:15 +03:00
PsiOmegaDelta
5575acccfd Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-07-11 09:51:24 +02:00
Loganbacca
8848a51fe8 Fixed dropping modules on conveyor belts 2015-07-11 03:26:41 +12:00
mwerezak
51eecd54f0 Fixes disposal bins filling instantly
Fixes disposal bins filling instantly, side effect of fixing
air_contents having the wrong volume
2015-06-24 22:09:47 -04:00
mwerezak
cb0b3a30da Fixes runtime
Fixes the other runtime in #9310
2015-06-24 00:13:41 -04:00
mwerezak
a147a4e15e Removes fat mutation checks 2015-06-23 23:36:19 -04:00
mwerezak
285ce84044 Fixes disposals not transferring gas to holder, creating air_contents with the wrong volume, runtime due to terrible management of shared gas_mix
Fixes one of the runtimes in #9310
2015-06-23 23:32:27 -04:00
Karolis2011
9ff27dc038 Now when welding sorting pipe, game update it's name 2015-06-04 20:48:57 +03:00
Karolis2011
0999f1ab78 Made sorting pipes dispesible
also fixes #9305
2015-05-16 17:27:39 +03:00
Zuhayr
495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
Zuhayr
bc50ba5166 Merge resolution. 2015-05-11 11:47:24 +09:30
PsiOmega
3866fda394 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/ZAS/Turf.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/recycling/sortingmachinery.dm
2015-05-02 21:50:11 +02:00
mwerezak
cd707d8279 Resist verb cleanup
Fixes #8922 and cleans up resisting.
Moves various code pieces to new procs, subtypes, or other objects where
appropriate.
2015-05-01 01:23:26 -04:00
Zuhayr
dbf8e53020 Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores. 2015-04-26 12:53:26 +09:30
PsiOmega
e7d85f8edc Adds Destroys. 2015-04-24 17:11:14 +02:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
volas
855755f808 sanitize() refactor: first pass (sanitize) 2015-03-22 23:31:19 +03:00
Zuhayr
a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
PsiOmega
12e17e666f Minor casing fix.
I couldn't unsee the lowercase t in sentences beginning with "\the" instead of "\The". I'm sorry..
2015-02-11 19:53:08 +01:00
PsiOmega
a57cd8c380 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-02-03 14:51:54 +01:00
volas
8abd7d0735 correction of all copytext(sanitize(..)) to sanitize(copytext(..)) 2015-02-01 22:54:56 +03:00
PsiOmega
6fabf503e1 Merge remote-tracking branch 'upstream/master' into dev 2015-02-01 17:39:19 +01:00
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
ccomp5950
27765f799f Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
Conflict resolution.

Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
2015-01-06 12:36:28 -05:00
mwerezak
f9344a5a2d Atmos machine update
Takes a pass at updating ATMOSPHERICS to take advantage of the new powernet changes.

Also removes var/on definitions from many atmos machines. Machines generally shouldn't
be doing "on" things if they aren't using power, and most players don't expect a machine
to use power if it isn't "on," so I guess this is fair game.

Also, further refactoring.
2015-01-02 01:46:18 -05:00
Zuhayr
c7f0d7cfc7 Merge resolution. 2014-12-30 05:52:59 +10:30
Zuhayr
dfb6390cad Merge pull request #7536 from mwerezak/disposal
Adjusts disposal pressure
2014-12-28 13:14:01 +10:30
Zuhayr
34a73a4cb1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into limbs 2014-12-27 02:02:43 +10:30
mwerezak
8db95a3ad6 Adjusts disposal pressure
Makes disposals no longer a vacuum in a standard environment.
2014-12-25 18:58:49 -05:00
mwerezak
b648c31d83 Fixes #7111 2014-12-25 15:46:48 -05:00