cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,473 Commits 8 Branches 0 Tags
af1d624a992bd1b29e7387c696a10383893df2a1
Commit Graph

510 Commits

Author SHA1 Message Date
PsiOmega
9d90691605 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/gamemodes/wizard/spellbook.dm
 2015-06-14 10:35:29 +02:00
mwerezak
17a84d9dd3 Hotfix for #9235 
Hotfix for master
 2015-06-13 13:37:37 -04:00
Zuhayr
1bb063041b Merge pull request #9718 from mwerezak/zonemerge 
Allows small zones to merge even if zone-blocked
 2015-06-07 15:13:09 +09:30
mwerezak
03412a24f8 Allows indirectly connected turfs to merge zones if either zone is small enough. 
Fixes #9235
 2015-06-06 23:24:11 -04:00
GinjaNinja32
16faba0f7c Merge pull request #9692 from Baystation12/dev-freeze 
Dev freeze
 2015-06-05 20:32:30 +01:00
Zuhayr
589aecd40e Merge pull request #9691 from Baystation12/master 
master into dev-freeze
 2015-06-05 21:41:58 +09:30
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
mwerezak
8b11ad89f7 Corrects comment, multiz stub, no-zone default 2015-06-02 23:49:06 -04:00
GinjaNinja32
3434826eaf Merge pull request #9490 from Zuhayr/xenoruins 
Random map generator expansion.
 2015-06-02 20:59:52 +01:00
Zuhayr
ebe62cefd8 Refactored random map generator system and added several terrain generators. 
Created a global list to track base turfs for explosions/shuttle moves.
Remaps the asteroid to be a moonlet. Tidies up some references to 'asteroid', removes moonbase from the accessible z level list.
 2015-06-03 04:36:19 +09:30
GinjaNinja32
314a28fa75 Merge remote-tracking branch 'upstream/dev' into span_class=notice 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/OpTable.dm
	code/game/machinery/floodlight.dm
	code/game/machinery/spaceheater.dm
 2015-06-02 17:33:20 +01:00
Mloc
c1ce2f02b7 reorganize xgm into its own module 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-06-02 16:29:23 +01:00
PsiOmega
5e84bfa57c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/ert.dm
 2015-05-30 15:59:54 +02:00
GinjaNinja32
e8f02b8496 Minor folders. code/defines, code/FEA, code/__HELPERS, code/_onclick, code/TriDimension, code/ZAS 2015-05-29 20:36:48 +01:00
mwerezak
1d5c971a45 Fixes #9452 2015-05-26 22:34:06 -04:00
HarpyEagle
10067349b2 Cleans up debug prints 2015-05-19 17:47:51 -04:00
mwerezak
953e8be44e Fire tweak 2015-05-19 00:09:37 -04:00
Mloc
79a191a2b5 dynamic fire colours 
Fire colour + light colour changes with temperature.

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 20:54:29 +01:00
Mloc
16d50c645d new object-based lighting system 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 20:54:25 +01:00
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
03e88ca9a5 Updates locate(/obj/machinery/door/airlock) hack 2015-04-29 20:53:50 -04:00
mwerezak
a80cb1b44e Fixes edges being lost when zones are merged 2015-04-29 20:27:39 -04:00
mwerezak
277103f1cd Fixes tiny door zones 
Fixes #8987 by deferring the update of self-zone-blocked turfs until after non-self-zone-block turfs have updated (and thus have valid zones).
 2015-04-29 13:01:26 -04:00
mwerezak
fbede7a193 Minor ZAS-related cleanup 2015-04-28 23:00:56 -04:00
PsiOmega
1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning 
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
 2015-04-24 17:13:37 +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
eca7569077 Clean server start. 
Server start messages concerning initialization, object generation, etc. is now only propagated to users with R_DEBUG access.
 2015-04-18 15:32:25 +02:00
PsiOmega
1daf0abe3d Switches around turf/datum garbage handling (my fault..). Adds null check for zone rebuilds. 2015-04-16 14:23:19 +02:00
Zuhayr
7ac1e44628 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-26 17:01:33 +10:30
GinjaNinja32
61a8b8e14c Fixes #8450 2015-03-25 02:17:02 +00:00
Zuhayr
e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
PsiOmegaDelta
668c4baee7 Merge pull request #8382 from comma/monkey_revenge 
Allows you to scoop monkeys up
 2015-03-09 21:17:03 +01:00
mwerezak
c432268596 Fixes fires burning forever 
Fixes fires grinding to a near halt but never actually stopping.
 2015-03-09 01:45:31 -04:00
mwerezak
0f290f0ffd Implements phoron flashpoint 2015-03-09 01:00:26 -04:00
mwerezak
b71f6c1121 Partial breathing refactor 
Reorganizes breathing, and moves common human/monkey breathing code into
carbon. handle_breath() is largely unchanged.
Removes unnecessary handle_internal_lifeform().
Fixes monkies being held by people in mecha in space not being able to breathe.
 2015-03-09 00:09:34 -04:00
Chinsky
81a9f87ad7 Merge pull request #8336 from mwerezak/liquidfire 
Implements liquid fuel fires
 2015-03-03 10:31:49 +03:00
mwerezak
49b3db964f Implements fuel fires 
Implements liquid fuel fires using the liquid fuel cleanable decal objects.
Rewrites zburn to be more sane, replaces convoluted calculations with straightforward reaction limit.
Fixes issue with liquid fuel spreading caused by thee object being deleted.
Prevents zones from being repeatedly added to the active fire zones list, and processed repeatedly.
 2015-03-02 12:40:01 -05:00
Chinsky
5502779652 That should be it for procs there. 2015-02-27 13:09:40 +03:00
Chinsky
4db51c68ef Missed a spot in airflow fixes. 2015-02-26 13:55:27 +03:00
Chinsky
728d90d06f Now airflow knockout uses proper Weaken proc to doublecheck for flags. Should fix #8254 
Also cleans up it a bit and adds span classes.
 2015-02-26 11:17:54 +03:00
SkyMarshal
8898689c5d Cleared out my WIP folder. 2015-02-03 03:20:42 -07:00
Atlantiscze
5f921676d8 ZAS Emergency fix 
- Fixes massive losses of heat during ZAS operation.
 2015-01-04 02:16:07 +01:00
Mloc-Argent
debba68c44 add sleeping for ZAS connection edges 
Edges will sleep and fully balance if compare() passes.
also some small small xgm tweaks.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-12-21 20:35:40 +00:00
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()' 
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-12-01 13:44:02 +00:00
mwerezak
b84bb4ff23 Fixes bubble/hull shield generators not updating air zones, update_nearby_tiles() cleanup. 2014-11-28 19:37:31 -05:00
Mloc-Argent
4871a3a850 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	icons/atmos/pipes.dmi
 2014-10-15 22:13:44 +01:00
Mloc
28e0539359 fix an issue with ZAS geometry not re-forming 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-14 11:57:31 +01:00
Zuhayr
6c96f3d66b Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into dev 2014-10-02 02:39:37 +09:30
Chinsky
dd9b3fe613 Merge pull request #6565 from Mloc/bs12-fan 
small fixes 2
 2014-10-01 13:39:35 +04:00
Mloc
ee4eafa660 fixes #6090 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-01 10:17:55 +01:00