6caf4cfebf
Merge remote-tracking branch 'upstream/master' into wires-tgui
2020-09-14 08:51:32 -05:00
e6bd4b6638
fix ups
2020-09-13 18:33:21 -04:00
85abb6505b
Merge remote-tracking branch 'upstream/master' into alarm-overhaul
2020-07-10 15:05:37 -04:00
4e90c9fe6f
fix wrong comment
2020-07-05 13:47:25 -05:00
9cfd206885
tgui wires
2020-07-04 23:14:30 -05:00
e305530d59
Obliterates Zombies
2020-07-02 21:22:55 +01:00
f13ae9e167
Overhauls and Refactors Alarms
2020-07-01 17:41:47 -04:00
04ba5c1cc9
File standardisation ( #13131 )
...
* Adds the check components
* Adds in trailing newlines
* Converts all CRLF to LF
* Post merge EOF
* Post merge line endings
* Final commit
2020-03-17 18:08:51 -04:00
6b82bfe47d
Merge remote-tracking branch 'upstream/master' into zombies
2019-09-03 15:52:43 -04:00
a4f187ac38
Adds Book of Babel and Jacob's Ladder
2019-08-27 16:04:54 -04:00
6ee8c0d96f
Merge remote-tracking branch 'upstream/master' into zombies
2019-08-04 21:05:10 -04:00
2a0a0769b0
spacing and fixes the spam-self-attack exploit with the picker
2019-08-02 18:19:56 +03:00
7153552297
Magic strings to defines, adds a GLOB list for the beacons
2019-08-02 17:40:37 +03:00
8083b51a96
Initial commit
2019-05-16 22:36:30 -04: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
d0a077f9d5
Powernet Refactor
2019-04-27 02:06:04 -04: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
0034e851a1
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
092773132d
no_lava fix, make sure simple explosions don't nuke the Syndicate base
2019-04-20 03:09:13 +02:00
13c26d716c
Uses a list instead of world search
2019-03-09 10:31:36 +00:00
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
91ef2d7be2
it's alive
2019-02-06 20:01:30 +00:00
0358bfef42
fix bugs, remove cult free golems
2019-02-04 13:11:11 +00:00
cf1a95dabc
fix config options
2019-02-04 00:21:13 +00:00
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
f7627d2fcb
Resolves conflicts.
2018-10-11 05:36:22 -05:00
4c062212ab
refactors global lists.
2018-10-06 08:02:45 -05:00
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
c974e29a3c
global lists global defined
2018-10-02 15:52:46 -05:00
14ba039d81
GLOB
2018-05-30 21:47:03 +01:00
2ec3c797fd
RPD refactor: part 2
2018-05-30 21:47:03 +01: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
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
543add7c10
Initial Commit
2017-08-10 18:01:03 -04:00
17d7232cf3
Removes Disease one and Virology
2017-07-08 23:10:17 -04:00
08c8ba569c
Adds Radio Jammers
2017-06-30 18:20:21 -04:00
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
840326ebe0
Adds celllogs (hopefully)
2017-05-08 17:24:46 +02:00
9eadc35e35
Comms program.
2017-02-21 12:37:28 -03:00
dea264faf2
Merge branch 'master' into stationgoals
2017-02-17 18:05:15 +01:00
9f20cb1685
Fixes merge conflict in event_container
2017-02-10 22:07:05 -08:00
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
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
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
e5ab12acd0
PR 2 Creation
2017-01-07 00:18:43 -08:00
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
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
b3f505175e
Announcement refactor
2016-10-24 22:03:18 +02:00
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
78d311d20a
Nano-Mob Hunter GO! WIP commit
2016-09-03 02:25:53 -04:00
SteelSlayer