PsiOmega
f25e8a7a67
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/stacks/tiles/plasteel.dm
code/game/objects/items/stacks/tiles/tile_types.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/pai/pai.dm
code/modules/surgery/implant.dm
code/setup.dm
2015-06-26 20:28:47 +02:00
mwerezak
9d7a1b9ad6
Fixes misleading path and proc name
2015-06-26 00:40:31 -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
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
e8f02b8496
Minor folders. code/defines, code/FEA, code/__HELPERS, code/_onclick, code/TriDimension, code/ZAS
2015-05-29 20:36:48 +01: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
Zuhayr
b4a254fe36
Merge pull request #6296 from GinjaNinja32/multiz-fixes3
...
Multiz fixes and mapping features
2014-09-08 11:20:34 +09:30
GinjaNinja32
b9f596a126
Multiz fixes and mapping features take 3
2014-09-07 15:32:36 +01:00
Kelenius
b761ff5fcf
Fixes floor tiles
...
Laugh.
2014-09-06 21:34:00 +04:00
Kelenius
505f857eb8
Stack update
2014-09-02 09:59:32 +04:00
Kelenius
a1348faa8c
Cables are now stacks
2014-08-25 18:54:35 +04:00
Mike
ba97193bef
Fixes #4635
2014-04-19 17:12:13 -04:00
Zuhayr
e870d614c2
Mass correction of controler to controller.
2014-01-25 03:15:13 +10:30
LordBraindead
d5eb58d8d6
generalized the z-level atmospipes
2014-01-19 12:00:22 +01:00
LBraindead
ac1f334919
Update Turfs.dm
...
open space
2014-01-18 00:37:52 +01:00
SkyMarshal
82ed4f809f
Revert "Revert pull request #1605 and #1606 due to temperature bugs killing the crew" since that code did not touch any temperature things, or even any ZAS things and I got no answers even after asking for about 18 hours...
...
This reverts commit 5e2f4948d0
2012-08-12 18:41:27 -07:00
Albert Iordache
5e2f4948d0
Revert pull request #1605 and #1606 due to temperature bugs killing the crew
2012-08-12 12:17:35 +03:00
SkyMarshal
2ed777a53e
Just committing my work before bed.
2012-08-12 01:00:40 -07:00
SkyMarshal
0bee1cb6b5
Work on 3D stuff.
2012-08-11 23:40:28 -07:00
