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
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
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
bcb1ea5413
Endgame tweaks.
...
Now instead calls the proper round-end proc when finishing the round, allowing admins to interrupt restart if desired.
None of the current end game variants currently use over/underlays, they are now content with coloring space.
On endgame start, the entire world is now updated in a spawn() instead, reducing crippling lag.
Adds support to designate APCs are critical, these are not drained during world end events.
Fixes a couple of potential runtime errors if no escape points have bee mapped in.
People in wheelchairs and mechas can now enter the world end rift.
Cult walls no longer cultify over and over, indefinitely.
2015-05-26 12:29:50 +02:00
Zuhayr
358867f3b5
Major sheet and material refactor.
2015-05-17 01:46:53 +09:30
PsiOmega
ca7fa2aa19
Grilles and rods.
...
Grilles no longer return more rods than they were created from when destroyed (by method other than wirecutters).
Rods are now acquired from and returned to a pool.
Also adds a pre-broken grille for mapping, avoids the case where one might be able to destroy the same grille twice.
2015-05-02 21:35:02 +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
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
mwerezak
d4a193808b
Replaces awful connect type system with bitflags
2014-12-23 18:59:54 -05:00
Mloc
83f2a5ba5a
fix some misplaced set_dir()s
...
fixes part of #7284
fixes #7288
fixes one of #7287
Signed-off-by: Mloc <colmohici@gmail.com >
2014-12-08 10:09:09 +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
Zuhayr
90d65aed57
Removed attack_paw, attack_animal and attack_slime.
2014-11-13 17:15:29 +10:30
Chinsky
0167be6920
Merge pull request #6275 from RavingManiac/dev
...
NewPipe
2014-09-09 17:54:53 +04: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
RavingManiac
1f5ee94096
Supply/scrubber upward pipes, downward pipes and pipe caps added.
2014-09-06 01:22:03 +08: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
5709dc2629
Fixes so ladders actually connect and function now.
2014-01-25 04:16:18 +10:30
Zuhayr
697cfdb98c
Compile fix for merged icon.
2014-01-25 03:17:10 +10:30
Zuhayr
e870d614c2
Mass correction of controler to controller.
2014-01-25 03:15:13 +10:30
Zuhayr
d38c190a57
Merged multiz icons into structures.dmi.
2014-01-25 03:13:56 +10:30
Zuhayr
3093a00707
Renamed controler.dm.
2014-01-25 03:13:06 +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
LBraindead
6cef89777d
Update Structures.dm
...
stairs and ladders
2014-01-18 00:37:22 +01:00
LBraindead
e9838702ff
Update Pipes.dm
...
add up and down pipe
2014-01-18 00:36:46 +01:00
LBraindead
b7c502152c
Update Movement.dm
...
jetpack movement
2014-01-18 00:36:14 +01:00
LBraindead
d106e70b02
Create controler.dm
...
z-level controler
2014-01-18 00:35:36 +01:00
Mloc-Argent
a084f74c7d
Expansion of every "icon = ''" path.
...
Supposed to help compilation times. Who knows.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-09-01 21:53:36 +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
b37ea52f4d
Some code that ensures ladders and shit play nice with the modular Z-levels
2012-08-12 00:16:14 -07:00
SkyMarshal
4b1f394b2b
Made a whoopsie in the ladder code, now conforms to modular Z-levels.
...
Signed-off-by: SkyMarshal <skymarshal1729@gmail.com >
2012-08-11 23:53:07 -07:00
SkyMarshal
0bee1cb6b5
Work on 3D stuff.
2012-08-11 23:40:28 -07:00
