Mark van Alphen
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
Fox McCloud
d0a077f9d5
Powernet Refactor
2019-04-27 02:06:04 -04:00
Mark van Alphen
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
Fox McCloud
0034e851a1
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
Mark van Alphen
092773132d
no_lava fix, make sure simple explosions don't nuke the Syndicate base
2019-04-20 03:09:13 +02:00
AffectedArc07
13c26d716c
Uses a list instead of world search
2019-03-09 10:31:36 +00:00
datlo
c57ec440e1
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into navconsoles2
...
# Conflicts:
# code/modules/shuttle/shuttle.dm
2019-02-11 13:31:37 +00:00
datlo
91ef2d7be2
it's alive
2019-02-06 20:01:30 +00:00
datlo
0358bfef42
fix bugs, remove cult free golems
2019-02-04 13:11:11 +00:00
datlo
cf1a95dabc
fix config options
2019-02-04 00:21:13 +00:00
datlo
61c0f71cce
Replaces uplink management by automated sharing
...
Various admin outfits changes
Add internal box to honk brand infiltration kit
Add fifty TC stack buyable by nukies
Add subtypes of uplinks : Traitor, Nuclear, SIT, SST, Admin, only
checked by auto sharing for now
2019-01-03 16:29:31 +00:00
Desolate
f7627d2fcb
Resolves conflicts.
2018-10-11 05:36:22 -05:00
Desolate
4c062212ab
refactors global lists.
2018-10-06 08:02:45 -05:00
Aurorablade
ce3ecee145
Port of TG ghost role spawner and Corpse Landmark refactor ( #8211 )
...
Port of TG ghost role spawner and Corpse Landmark refactor
2018-10-03 11:31:55 +08:00
Desolate
c974e29a3c
global lists global defined
2018-10-02 15:52:46 -05:00
Citinited
14ba039d81
GLOB
2018-05-30 21:47:03 +01:00
Citinited
2ec3c797fd
RPD refactor: part 2
2018-05-30 21:47:03 +01:00
tigercat2000
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
tigercat2000
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
Fox-McCloud
543add7c10
Initial Commit
2017-08-10 18:01:03 -04:00
Fox-McCloud
17d7232cf3
Removes Disease one and Virology
2017-07-08 23:10:17 -04:00
Fox-McCloud
08c8ba569c
Adds Radio Jammers
2017-06-30 18:20:21 -04:00
Fruerlund
bde62d63b0
Records will now be saved and can be printed again
...
Log files will now be stored in a list and can be accessed via the
security records computer
2017-05-14 18:59:56 +02:00
Fruerlund
840326ebe0
Adds celllogs (hopefully)
2017-05-08 17:24:46 +02:00
davipatury
9eadc35e35
Comms program.
2017-02-21 12:37:28 -03:00
Mark van Alphen
dea264faf2
Merge branch 'master' into stationgoals
2017-02-17 18:05:15 +01:00
Kyep
9f20cb1685
Fixes merge conflict in event_container
2017-02-10 22:07:05 -08:00
Markolie
f2497afd9d
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals
...
# Conflicts:
# _maps/map_files/cyberiad/z2.dmm
# code/__DEFINES/is_helpers.dm
# code/__DEFINES/misc.dm
# code/_globalvars/lists/objects.dm
# code/modules/mob/living/living_defines.dm
# icons/effects/beam.dmi
2017-02-05 20:12:51 +01:00
Markolie
a06c997629
Add Station Goals
...
Still to-do:
* Remove old BSA computer.
* Add NanoUI interfaces for all goals.
* Test it.
2017-01-23 22:02:29 +01:00
Markolie
a50a3d59b9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__DEFINES/is_helpers.dm
# code/_globalvars/lists/objects.dm
# code/game/machinery/turrets.dm
# config/example/config.txt
# goon/browserassets/css/browserOutput.css
# icons/obj/library.dmi
# icons/turf/floors.dmi
2017-01-20 23:43:35 +01:00
Kyep
e5ab12acd0
PR 2 Creation
2017-01-07 00:18:43 -08:00
Markolie
f4c4bfe288
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__HELPERS/unsorted.dm
# code/_globalvars/lists/objects.dm
# code/controllers/verbs.dm
# code/game/gamemodes/cult/ritual.dm
# code/game/gamemodes/cult/runes.dm
# code/game/objects/items/stacks/sheets/sheet_types.dm
# code/modules/mob/spirit/mask/mask.dm
# code/modules/mob/spirit/viewpoint.dm
# icons/effects/96x96.dmi
# icons/effects/effects.dmi
# icons/mob/actions.dmi
# icons/obj/weapons.dmi
# icons/obj/wizard.dmi
# icons/turf/floors.dmi
2017-01-06 16:36:46 +01:00
Markolie
1f243ec4f0
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
...
# Conflicts:
# code/_globalvars/lists/objects.dm
2016-12-31 17:54:06 +01:00
Markolie
b3f505175e
Announcement refactor
2016-10-24 22:03:18 +02:00
Markolie
2e711d1337
Lay groundwork for megafauna, and add Ashdragon.
...
Includes a refactor for gun turrets (merged into portable turrets), hostile simple_animal behaviour, spells (sounds have been added) and poi_list items.
2016-10-23 23:15:57 +02:00
FalseIncarnate
78d311d20a
Nano-Mob Hunter GO! WIP commit
2016-09-03 02:25:53 -04:00
Fox-McCloud
41a74fb865
Malf AI Rework
2016-08-11 05:16:06 -04:00
Fox-McCloud
8cd140e48a
Adds in Fast Processing
2016-08-09 06:55:00 -04:00
SamCroswell
0466499f86
Personal Crafting - Initial Commit
2016-07-15 16:25:37 -04:00
FalseIncarnate
a68ddb1116
Global Intercom list, minor code cleanup round 2
2016-05-06 03:20:00 -04:00
Fox-McCloud
5145825470
Part 4
2016-04-17 22:48:05 -04:00
Tastyfish
25195208a9
Ports tg simple_animal bots
2016-03-28 00:22:04 -04:00
Aurorablade
5f98feb0bc
meanwhile as i driver tiger INSANE
2016-02-25 16:17:39 -05:00
Aurorablade
f352c290de
end conflict fix
2016-01-21 21:34:16 -05:00
Aurorablade
363da58264
being conflict fix
2016-01-21 20:50:24 -05:00
Aurorablade
92e15c1b2a
BREAK ALL THE THINGS
2015-12-31 01:23:44 -05:00
Tigercat2000
e60799474b
tgshuttles unfinished
2015-12-03 10:59:06 -08:00
Fox-McCloud
9795dc761b
Removes Nations and Unused Game Modes
2015-10-11 19:51:19 -04:00
Fox-McCloud
d7f23f4271
Oh, that kind of list
2015-09-27 19:39:09 -04:00
Fox-McCloud
155afc6131
lists
2015-09-27 19:24:35 -04:00
