3e60237b52
Syndicatre base map fixes
2019-06-02 04:18:10 +02:00
2618def9a1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# _maps/map_files/Delta/delta.dmm
# _maps/map_files/MetaStation/MetaStation.v41A.II.dmm
# _maps/map_files/MetaStation/z4.dmm
# _maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
# _maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
# _maps/map_files/RandomZLevels/spacebattle.dmm
# _maps/map_files/cyberiad/cyberiad.dmm
# _maps/map_files/cyberiad/z4.dmm
# _maps/map_files/cyberiad/z6.dmm
# _maps/map_files/generic/z5.dmm
# code/__DEFINES/misc.dm
# code/__HELPERS/unsorted.dm
# code/game/objects/structures/lattice.dm
# code/game/turfs/space/space.dm
# code/modules/mob/mob.dm
# code/modules/ruins/ruin_areas.dm
# paradise.dme
2019-05-08 21:40:35 +02:00
9009cd443e
Fix pipe layering
2019-05-04 00:47:16 +02:00
ba0f6abb02
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/game/objects/items.dm
# code/modules/power/cable.dm
# icons/mob/inhands/items_lefthand.dmi
# icons/mob/inhands/items_righthand.dmi
# icons/obj/lighting.dmi
# paradise.dme
2019-04-30 19:26:17 +02:00
ad2238f496
Merge branch 'master' into lighting
2019-04-30 19:15:58 +02:00
92ec9cf253
Merge pull request #11348 from Arkatos1/AtmosShortcut
...
Adds shortcuts for handling pumps, volume pumps, filters, and mixers + Ability to rename them with a pen
2019-04-30 12:10:52 +08:00
4423962a2a
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/controllers/subsystem/mapping.dm
# paradise.dme
2019-04-26 23:07:57 +02:00
e4dd9110ee
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
...
# Conflicts:
# paradise.dme
2019-04-26 22:58:56 +02:00
0034e851a1
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
ccef4d1187
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# icons/mob/actions/actions.dmi
# paradise.dme
2019-04-24 02:55:32 +02:00
0d883a5b88
Darkness handling update
2019-04-23 22:59:00 +02:00
c4dc5ecd3d
Merge branch 'ambientocclusion' of https://github.com/Markolie/Paradise into lighting
2019-04-22 18:52:55 +02:00
fa6a27e3a9
Fixes invalid indentation
2019-04-22 18:49:30 +02:00
cc35fb8b0c
Code improvement
2019-04-22 18:43:17 +02:00
4761ded0d4
Merge pull request #11350 from AffectedArc07/ss-everything
...
Gives the orphans a home
2019-04-21 18:44:38 -04:00
ff78ff1a9c
SScommunications
2019-04-21 20:12:14 +01:00
b00c44d701
Added ability to rename devices with a pen, sanity checks, reduced code spaghetti
2019-04-21 19:27:54 +02:00
3f6b8478ff
Added atmos shortcut for pumps, volume pumps, filters and mixers
2019-04-21 17:06:34 +02:00
f9d067e9e6
Remove rotatium from vent_clog and remove useless return
2019-04-21 01:54:31 +02:00
211468b24f
Add fake ambient occlusion
2019-04-21 01:45:30 +02:00
6faf9c769f
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/modules/mob/living/simple_animal/friendly/farm_animals.dm
# paradise.dme
2019-04-17 22:46:43 +02:00
93118f9d34
Remaps Toxins
2019-04-11 07:24:16 -04:00
45a066c7d1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/modules/food_and_drinks/recipes/recipes_grill.dm
2019-03-30 22:55:09 +01:00
c370e08233
Port the actual Lavaland map (and associated fixes)
2019-03-30 04:12:37 +01:00
489359d6d1
Adds Unidentified Gas in Deep Space
2019-03-22 16:00:56 -04:00
6850d3d27a
multitool fixes
2018-11-20 14:21:25 +01:00
e3f852dff6
magic numbers
2018-11-16 15:32:49 +01:00
544e548f4e
Merge pull request #9624 from alex-gh/unary_pipe_fix
...
It is no longer possible to duplicate uvents.
2018-10-20 08:37:53 +08:00
c974e29a3c
global lists global defined
2018-10-02 15:52:46 -05:00
8898c7346b
It is no longer possible to duplicate uvents.
2018-09-27 22:52:16 +02:00
037f215d16
updates vars to use the defines
2018-09-16 01:22:57 +01:00
b2d0bb1c0b
Fixes maploading so that the cyberiad and space hotel load cleanly again
2018-07-24 20:58:38 -07:00
695d7b7c23
Remove debugging stuff
2018-04-28 18:04:38 -07:00
7d8c9a731a
SS Conversion: Atoms, Machines, n' Mobs
...
This converts the machine and mob processes to the SMC. Additionally, it
adds the Atom subsystem, which handles all Initialize() calls in place
of the old gameticker. Due to incompatibility with our atmospherics
(FUCK OUR ATMOSPHERICS FOR FUCKING EVER JESUS CHRIST WHO THE FUCK MADE
THIS PIECE OF GODDAMN SHIT) atmospherics machines do not use
Initialize() as they should, instead opting for a custom atmos_init
proc that the air controller handles.
2018-04-28 17:55:15 -07:00
8c7b543415
The Great Conflictening 2.0: Removes /obj/item/device
2018-04-25 23:07:35 -04:00
2b25584372
Merge remote-tracking branch 'upstream/master' into remove-weapons
2018-04-19 17:01:38 -04:00
5c4aa9b3fd
Removes All Weapons
2018-04-15 16:25:56 -04:00
4f777d76ea
Makes Pipenets Actually Rebuild and Pipes GC
2018-04-15 04:16:09 -04:00
129e1f66f7
GC radio stuffs
2018-04-14 13:44:26 -04:00
22dc6860b3
Ports TG's Garbage Subsystem
2018-03-28 20:02:39 -04:00
5701ea7c75
Ports Nano UI to Subsystems
2018-03-26 23:59:52 -04:00
b14faa19c3
Merge remote-tracking branch 'upstream/master' into SMC
...
# Conflicts:
# code/__DEFINES/flags.dm
2018-03-22 15:35:12 -07:00
b1278de3d2
Merge pull request #8674 from uraniummeltdown/attacks
...
[READY] Attack Code Update
2018-03-22 11:55:53 -07:00
1ca410b91e
Fix various syntactic problems
2018-03-06 23:19:39 -08:00
946ae0d58d
moves var/list/armor to /obj level
...
adds armor to many objects
re-adds the clockcult floor sprite (accidentally removed in another PR)
adds clockcult effects to the clockcult floor
adds clockcult grilles
adds var/broken to /obj/structure
adds unused resistance_flags var
moves burn_state and resistance_flags to flags.dm
more updates to attack code
updated obj_defense.dm procs
2018-03-04 13:52:54 +05:00
dca16e60cf
PS -> SMC Ports: LINDA, Spacedrift, Throwing
...
This commit ports LINDA, spacedrifting, and throwing to the SMC.
2018-03-02 23:58:57 -08:00
d831636715
fixes atmos machines not dropping frame and parts
...
moves drying rack dropping wood out of Destroy()
transfers fingerprints to dropped machine frame, halves obj_integrity of non-disassembled deconstructed pipes and machine frames
2018-01-09 23:18:22 +05:00
75e177b7a9
renames receive_damage() for animations to receiving_damage()
...
renames take_damage() for organs to receive_damage()
renames Deconstruct() to deconstruct() for atmos objects
obj_integrity, max_integrity, integrity_failure vars moved to /obj level, obj_integrity = max_integrity on New()
2017-12-28 00:32:54 +05:00
77810081e7
Merge pull request #8331 from uraniummeltdown/effectfiles
...
Splits effect_system.dm into multiple files and cleans it up, OOP particle effects and effect systems
2017-11-26 12:35:01 -08:00
b4fa39d940
512 Compilation & Travis
2017-11-11 09:50:21 -08:00
Mark van Alphen