cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,723 Commits 6 Branches 0 Tags
fa92cdeeda4574b494d1dbdbb59ae50f50c14c37
Commit Graph

262 Commits

Author SHA1 Message Date
SinTwo
045c393683 Revert "Revert "Frame Cleanup"" 
This reverts commit 82722ba42f.
 2016-08-13 19:55:57 -04:00
Yoshax
82722ba42f Revert "Frame Cleanup" 2016-08-06 00:27:03 +01:00
SinTwo
66c3a007a9 frame cleanup fixes 2016-07-23 23:45:24 -04:00
SinTwo
5d25d72593 Frame Fixes 2016-06-01 14:32:56 -04:00
SinTwo
5ae20ceb8b Buildables v1.2 (#1517) 
* Removes text2path, adds constructability to a few things, adds a locker_painter.dm, and several fixes.

* Fixes Maps due to working on ancient versions.

* Path error.

* Adds a missing ..()
 2016-05-03 22:18:12 +01:00
SinTwo
b356f5cf21 Construction Update 2016-03-25 16:02:36 -04:00
Kelenius
c9c9dde819 Removes old unticked code 2016-02-01 12:47:20 +03:00
mwerezak
5603884095 Removes #undefine 2015-08-18 17:20:39 -04:00
Zuhayr
a8dc3a282b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs 2015-08-18 12:06:53 -07: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
PsiOmegaDelta
7b5b7162d0 Merge pull request #10673 from Baystation12/master 
Dev-freeze
 2015-08-16 10:30:13 +02:00
mwerezak
176e4232ca Fixes #9155 
Heaters and freezers now check if there are other machines in their turf that have the same connection dirs.
 2015-08-15 18:28:09 -04:00
PsiOmega
cee5f1a057 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items.dm
 2015-07-06 18:33:09 +02:00
PsiOmega
cdb4270f48 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-07-06 17:31:41 +02:00
mwerezak
bd59733fdb Fixes #9714 
Fixes incorrect arguments to calculate_transfer_moles()
 2015-07-05 01:18:38 -04:00
GinjaNinja32
63ea8338fb Merge remote-tracking branch 'upstream/dev' into span_class=notice 
Conflicts:
	code/ZAS/Diagnostic.dm
	code/game/machinery/computer3/laptop.dm
	code/game/machinery/requests_console.dm
	code/game/objects/items/stacks/tiles/plasteel.dm
 2015-06-05 00:49:13 +01:00
PsiOmegaDelta
6c903907c0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-04 08:10:49 +02:00
mwerezak
17008aa7ed Copies vent pump hibernation over to scrubbers 2015-06-02 22:51:45 -04:00
GinjaNinja32
81d23c85cc code/ATMOSPHERICS \red \blue etc to span classes 2015-05-29 19:36:15 +01:00
PsiOmega
9006419fcd Creates a default vent for atmospherics tanks. 2015-05-14 15:31:39 +02:00
Chinsky
ad67215b08 Merge pull request #9073 from PsiOmegaDelta/QDels 
Implementing Destroy():s
 2015-05-12 18:26:57 +03:00
PsiOmega
66ead991e7 Terminals, scrubbers, airlocks, and alarms get a Destroy() review. 2015-05-12 08:16:30 +02:00
Mloc
e602a7e286 remove the sub-area system 
Removes area/list/related and area/master.
They were only used by the old lighting subarea system.

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 17:06:29 +01:00
PsiOmega
6f9da12276 Implementing Destroy():s 
First out: APCs, security camera consoles, vents.
 2015-05-03 10:45:35 +02:00
PsiOmega
fcfdcecd3a initialize() should now always be called, be it on game starting up or object being created after game start. 
Partially fixes #9036.
 2015-04-30 19:28:35 +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
PsiOmega
71a8ddf50e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/paperwork/paper.dm
	code/modules/projectiles/projectile.dm
 2015-04-08 10:55:26 +02:00
PsiOmega
d8a6576f36 Examination fixes. 
Fixes #8491.
Fixes #8579.
 2015-04-06 10:46:19 +02:00
PsiOmega
8e55ad8114 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/mob.dm
 2015-04-03 09:33:05 +02:00
PsiOmega
4326b8c5d8 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-04-03 09:22:23 +02:00
mwerezak
a116723fcd Updates canister process() to use atmos helper procs 2015-04-02 00:04:44 -04:00
Zuhayr
d26800d29c Preliminary work on converting all monkeys to a human subspecies. 2015-03-25 02:15:45 +10:30
mwerezak
6d15809768 Corrects return values for the Topic procs of several computers and some other machines as well. 2015-02-25 21:32:35 -05:00
Chinsky
2d03c412f7 Merge pull request #8182 from Neerti/2_20_2015_examine_tab_refactor 
Examine Tab 2: Revenge of the Refactor: Reloaded
 2015-02-22 11:32:32 +03:00
Neerti
3f16754e89 Third refactor for examine system! This time we go back to atom-var based system, but because strings are tabled, it's apparently okay. 
The entire system is now self-contained inside a module folder.
Also fixes a runtime I made because ghosts lack a mind (and so do I)
 2015-02-20 08:04:17 -05:00
PsiOmega
d32cffaefe NanoUI air alarm interface. Remote support lost. 2015-02-19 18:23:25 +01:00
RavingManiac
cc62c987ea Some TEG refactoring and UI improvements 
"circulator/heat exchanger" is now just called "circulator"
 2015-02-13 18:34:48 +08:00
RavingManiac
71902cdca2 Tweaked descriptions and settings of various TEG components. 
Maximum power of core vent and injector increased.
 2015-02-13 16:08:52 +08:00
RavingManiac
98dd5c46c0 Circulators now draw air based on the total volume of the pipe network connected to the input. They also generate some power in the same manner as pipe turbines. 
Thermoelectric generators now generate much more power, mostly due to the increase in circulator intake volume.

Supermatter no longer powers radiation collectors, and is tweaked to run at 4000-6000K.

TEG supermatter engine mapped in. Currently generates ~1MW of power with chamber temperature of 5000K.
 2015-02-13 00:38:23 +08:00
Kelenius
e6dc9d36fd Update for machine upgrades and some science 
Also adds RPED and makes biogenerator and borg charger constructible .
 2015-02-08 15:39:11 +03:00
Zulker Nayeen Nahiyan
0a3f523066 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev 
Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm
 2015-02-04 04:44:09 +06:00
Kelenius
37962065ae Adds oxygen and nitrogen to air alarm scrubber list 2015-01-16 23:02:55 +03:00
Zulker Nayeen Nahiyan
b6ab0b64c0 Cleanup global.dm and setup.dm, fix typos in the other files 
`code/setup.dm`:
	Fixed large amounts of indenting.
	Fixed large numbers of comments and their clarity.
	Added parentheses to macros using expressions.
	Added FIXME for unused duplicated macros, without certainty of their requirement.
	Removed some duplicate macros present. (`BRUTE`, `BURN`, etc.)
	Removed macro `PI`, and replaced instances of its use with `var/const/Pi` from `maths.dm`

`code/global.dm`:
	Fixed large amounts of indenting, added newlines to long single-lined list definitions.
	Slightly clarified comments.
 2015-01-10 02:01:55 +06: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
ccomp5950
a41b5bea52 Unary Vent Pump Optimizations. 
We have like 250 of these on the map, each one calculates the atmospheric properties of the air around it each tick.
99% of the time this isn't even needed.  So...if it's not needed this tick we hibernate for 5 to 10 ticks before checking again.
 2015-01-01 17:20:51 -05:00
mwerezak
d4a193808b Replaces awful connect type system with bitflags 2014-12-23 18:59:54 -05:00
Ccomp5950
cb0eca68ac Merge pull request #7297 from Amunak/pipez 
Engine remap, valves now show open/close state on examine.
 2014-12-08 20:47:09 -05:00
Mloc
efe78df3ff Merge pull request #7299 from Loganbacca/freezefix 
Fixes omni-filters not working
 2014-12-08 13:17:36 +00:00
Loganbacca
92c81aa958 Fixes omni-filters not working 2014-12-09 01:15:10 +13:00