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
e72fd8eae2
Fixes up battle terminal connections
...
Also increases the range on the first battle turn announcement to be
audible by both combatants, just like the turn announcements during the
battle.
2016-12-30 00:12:02 -05:00
da421d841c
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pogo
2016-12-29 21:13:00 -05:00
8609157751
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
# code/_globalvars/mapping.dm
# code/game/objects/effects/landmarks.dm
2016-12-30 00:17:56 +01:00
01f2c85347
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__DEFINES/misc.dm
# code/game/dna/genes/goon_powers.dm
# code/game/dna/genes/vg_powers.dm
# code/game/objects/effects/overlays.dm
# code/game/objects/structures/crates_lockers/closets.dm
# code/game/objects/structures/crates_lockers/closets/statue.dm
# code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
# icons/mob/back.dmi
# icons/obj/storage.dmi
2016-12-23 19:32:19 +01:00
b0e87ea7d3
Moved/renamed controller file
2016-12-21 18:17:47 -05:00
c5e6c9323b
addresses mrrowl comments
...
still haveing shuttle load issues after first one is loaded..
2016-12-11 23:11:21 -05:00
19925a3313
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI
2016-12-06 21:22:16 -05:00
c70e69004c
Timer Controller Update
2016-11-30 17:50:16 -05:00
52355cba9d
Added Legion megafauna, updated weather and some minor other refactors/changes.
2016-10-24 02:16:45 +02:00
01f4e64f12
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI
2016-10-12 20:37:09 -04:00
568e648bfb
Merge pull request #5581 from Fox-McCloud/cloning-update
...
Cloning Update
2016-10-11 16:51:34 -04:00
11a37ae960
Should make the rnd console less prone to freezing
...
"wait_message" is now guaranteed to be unset provided that the timer
controller doesn't go down, and it'll be reset anyways by the `spawn` if
nothing runtimes in there
2016-09-27 14:12:15 -07:00
bc7f3c67a6
Cloning Update
2016-08-31 01:48:02 -04:00
65d1c781c8
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI
2016-08-26 21:54:56 -04:00
d3c5c6dbbb
Adds the name back to the hash
2016-08-23 13:44:06 -07:00
ea669191d5
Moves airlocks to the addtimer system
2016-08-23 02:50:27 -07:00
4478855cfd
Process deferral and profiling improvements
2016-08-17 02:10:39 -04:00
39924a55fd
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI
2016-08-11 02:01:41 -04:00
91f18ac1d7
Merge pull request #5393 from Fox-McCloud/fast-processing
...
Adds in Fast Processing
2016-08-10 18:21:00 -04:00
359d33799d
tweaks
2016-08-09 14:32:55 -04:00
8cd140e48a
Adds in Fast Processing
2016-08-09 06:55:00 -04:00
5e90dd83ed
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI
2016-08-09 02:43:27 -04:00
79c9b690ac
EVERYBODY HURTS
2016-08-03 23:51:13 -04:00
bc93078da5
Merge conflicts begone
2016-08-01 18:28:47 -07:00
0cc2051f8a
Merge pull request #5251 from Fox-McCloud/fire-system
...
Implements Fire System
2016-08-01 19:39:50 -04:00
c48d216ebc
Fixes negated conditions
2016-08-01 14:25:38 -07:00
bf2bcbce67
Removes most hard-coded z level checks
2016-07-31 21:29:03 -07:00
a69b3fde45
work work
2016-07-31 22:57:37 -04:00
1da7d26b1e
tweaks
2016-07-31 11:56:42 -04:00
ae43de3652
Integrates the z level manager with the space transition system
2016-07-29 19:11:36 -07:00
bde5755916
Implements Fire System
2016-07-29 13:24:09 -04:00
9735ff78ac
shuttles
2016-07-28 23:47:05 -04:00
5b21a9a785
Improves voting system
...
- Makes votes show votes for winning option, or all options in a custom
vote
- Makes the voting panel automatically update
- Makes the voting panel use the browser datum
- Turns the voting notice into a clickable link
- Fixes admin status not properly being checked when the voting page is
refreshed
- Replaces vote process with a spawned loop in the vote controller
- Removes vote processing from the pre-game game ticker
2016-07-23 02:03:19 -04:00
fc6514f5ba
Merge remote-tracking branch 'upstream/master' into tg-weather
2016-07-16 11:07:43 -04:00
01ffeb45fe
more tweaks
2016-07-15 05:52:56 -04:00
84f9a06881
probably not necessary
2016-07-14 04:47:11 -04:00
5216b39339
Ports TG's Weather System
2016-07-14 04:29:28 -04:00
2c4d8e9b6a
You can now load the cyberiad runtime-free
2016-07-03 15:36:38 -07:00
f2b48c7c67
You can now load the cyberiad with the map-loader
2016-07-02 22:50:45 -07:00
7c85fc71eb
Fixes timer runtimes
2016-04-30 07:00:56 -04:00
3b59d2cd15
Defers pipenet and powernet rebuilds upon destruction of pipes and cables so explosions are faster
2016-04-29 23:42:47 -04:00
dcbdc4aa56
Minor fix to npc controller
2016-04-17 17:05:59 -04:00
1d04645730
Merge pull request #4145 from Tastyfish/snpcs
...
Ports SNPCs
2016-04-11 20:44:50 -04:00
a0ad6582a1
Updates maploader code to be in line with tg's, startup improvements
2016-04-10 02:57:58 -04:00
7d259d35c7
Ports SNPCs
2016-04-09 00:10:01 -04:00
78f53553f8
Reduce lines by removing blank lines added by PJ's script
2016-04-05 08:25:57 -07:00
9d430844c3
Replace most (if not all) output << operators with to_chat(user, message)
...
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.
Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
b2d9c2e6a9
Fixes mulebots killing passenger, bot tweaks
2016-04-03 15:39:54 -04:00
519992b5a9
Merge branch 'byond510'
...
Conflicts:
.travis.yml
code/game/jobs/access.dm
code/game/machinery/camera/camera.dm
code/game/machinery/flasher.dm
code/game/machinery/vending.dm
code/game/objects/items/devices/laserpointer.dm
code/game/objects/items/weapons/grenades/flashbang.dm
code/game/objects/items/weapons/tools.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/mob/living/life.dm
code/modules/mob/living/silicon/silicon.dm
code/modules/mob/living/simple_animal/bees.dm
code/modules/nano/modules/virus2_creator.dm
code/modules/virus2/disease2.dm
code/modules/virus2/diseasesplicer.dm
paradise.dme
2016-04-01 14:15:44 -07:00
Markolie