PsiOmegaDelta
9db4ba1da0
Adds a remote interaction state for NanoUI.
...
This state has two checks:
A preliminary check of the remote target, ensuring it's powered, etc. If the remote target is fully disabled, it closes the window and conducts no further checks.
It then makes a full check, ensuring that the mob is capable, within range of the source remoting to the remote target, etc.
Unlike most other static interaction states, whoever initializes the remote state is responsible for deleting it properly.
Conflicts:
polaris.dme
2015-12-07 02:56:43 -05:00
Neerti
c808371780
Merge pull request #444 from Neerti/12/4/2015_communicators
...
Adds cellphones!
2015-12-05 17:37:35 -05:00
Neerti
3e946447a3
Adds cellphones! Details in the changelog entry.
2015-12-05 17:26:13 -05:00
GinjaNinja32
944b1255e4
add verbs to allow players to spin their view
2015-12-05 10:52:29 +00:00
Neerti
e528bb13cb
Removes references to Lesser Form, a power that no longer exists.
2015-12-03 13:26:50 -05:00
Jon
5756e8e3bc
Updates the dme to add the new surgery defines.
2015-12-02 15:02:24 +00:00
Neerti
f21aa3645a
Fixes subspecies being available.
2015-11-28 22:56:50 -05:00
Neerti
87c54986da
Adds the groundwork to define many, many places in the lore in-game. This could have several applications and help bring the fluff in-game.
...
Places added:
Sol, needs lots of love.
Tau Ceti, needs more love.
Tajara, Skrell, and Unathi home systems. Taj needs to be finished.
Nyx, and Vir.
2015-11-26 10:41:19 -05:00
Neerti
b635a64530
Fixes socks. Again. For the third time.
2015-11-20 08:50:30 -05:00
Neerti
dd3ab4dac0
Finishes new ling, need better sprites but that's for another time.
2015-11-18 16:20:28 -05:00
Neerti
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
Neerti
45f15930a0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
...
Conflicts:
.travis.yml
code/_helpers/lists.dm
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
code/global.dm
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
code/modules/reagents/dispenser/dispenser2.dm
polaris.dme
2015-11-06 17:41:18 -05:00
Neerti
2f116e3374
Fixes a mistake involving belts not getting icons.
2015-10-29 21:56:36 -04:00
Neerti
92c1c468e4
Despite the name, they're not done, because reasons.
2015-10-29 21:22:42 -04:00
Woodrat
7128aa72db
Woodrat 9.1 "Back in Action"
...
- Super APC installed in Atmos
- Fixed APC, Mining Exterior APC
- Fixed Crematorium button, Installed mass driver button.
- Chapel hallway APC installed
- Gateway plugged in, console installed
- Elevator Console Installed, Bell Hop removed.
- Hazard stripes should be fixed
- Restored missing tiles (Hydro, Cafeteria Neutral, Asteroid exterior) (75% complete)
- Kitchen button restored
- Rec area bathroom lights restored
- Meat is back on the menu, two fridges with meat in the kitchen
- Unneeded wires in engineering maint removed.
- Medical substation wires fixed.
- Locker room maint APC installed
- Chapel maint APC installed
- Installed another light in robotics
- APC central maint installed
- Disposals pipe in engineering workshop fixed.
- Wire in atmos substation fixed.
2015-10-16 22:57:13 -07:00
Neerti
7571ba8c4b
Think I'm done.
2015-10-11 01:16:25 -04:00
SinTwo
ec58f7c705
TG_Port
...
Conflicts:
code/game/objects/items/devices/radio/headset.dm
code/game/objects/items/weapons/shields.dm
code/game/objects/items/weapons/storage/backpack.dm
code/modules/clothing/head/helmet.dm
code/modules/clothing/suits/miscellaneous.dm
code/modules/clothing/under/accessories/accessory.dm
code/modules/mob/new_player/sprite_accessories.dm
icons/mob/back.dmi
icons/mob/head.dmi
icons/mob/mask.dmi
icons/obj/clothing/hats.dmi
polaris.dme
2015-10-11 00:58:26 -04:00
Neerti
945aad7b4f
Fixes some map stuff.
2015-10-11 00:04:28 -04:00
Neerti
e52a0ea332
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
...
Conflicts:
.travis.yml
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/turfs/simulated.dm
code/global.dm
icons/misc/fullscreen.dmi
polaris.dme
2015-10-10 23:17:26 -04:00
Neerti
a9dda6cf3f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
...
Conflicts:
.travis.yml
code/game/gamemodes/cult/cult.dm
code/game/gamemodes/heist/heist.dm
code/game/gamemodes/ninja/ninja.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/gamemodes/wizard/wizard.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/objects/structures/lattice.dm
code/global.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/reagents/Chemistry-Recipes.dm
config/example/config.txt
polaris.dme
2015-09-06 18:26:06 -04:00
Neerti
3a5412df3a
Merge pull request #190 from PolarisSS13/master
...
Master to Dev 9/6/2015
2015-09-06 17:30:54 -04:00
Neerti
463ba53c3a
Adds system to describe how protective a piece of clothing is.
...
Also adds unused icons because byond won't let me use more than one per stat_icons.dm() proc. Hopefully someone finds a use for them later.
2015-09-06 15:52:46 -04:00
Neerti
b400f02fac
Tries to fix compile issue.
2015-09-04 09:35:18 -04:00
Neerti
b93595c19f
Merge branch 'master' into 9/4/2015_master_to_dev
...
Conflicts:
code/game/jobs/job/security.dm
code/modules/projectiles/guns/energy/nuclear.dm
code/modules/projectiles/guns/projectile/automatic.dm
maps/colony-1.dmm
maps/colony-5.dmm
2015-09-04 08:43:37 -04:00
Neerti
8a6e3e7f11
Saves the exodus maps, since they're good reference material.
...
Also the 5th colony map broke again.
2015-08-24 14:37:40 -04:00
Neerti
7fab70767d
colony-1 could not be saved, unfortunately. RIP
2015-08-23 18:04:47 -04:00
Neerti
00fa623c9d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
.travis.yml
code/controllers/configuration.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/machinery/Sleeper.dm
code/game/machinery/computer/communications.dm
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/turfs/simulated/floor.dm
code/game/turfs/simulated/floor_types.dm
code/global.dm
code/modules/materials/materials.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/projectiles/guns/projectile/automatic.dm
polaris.dme
2015-08-23 01:30:46 -04:00
Neerti
c29b47778f
Adds electric lockpick power.
2015-08-23 00:58:27 -04:00
Neerti
ecaf6758df
Begins work on new ling.
2015-08-20 11:38:48 -04:00
Neerti
b64744c4c6
Adds frag grenades.
2015-08-08 00:51:29 -04:00
Neerti
d911badae8
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/7/2015_bay_merge
...
Conflicts:
.travis.yml
polaris.dme
2015-08-07 20:25:57 -04:00
Neerti
95240c989b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync
...
Conflicts:
polaris.dme
2015-08-03 22:13:18 -04:00
Neerti
630469a745
Adds Tcomms back.
2015-08-03 03:22:44 -04:00
Neerti
8152ce0676
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/29/2015_bay_sync
...
Conflicts:
polaris.dme
2015-07-29 03:45:53 -04:00
Neerti
045c7323a0
Begins work on removing the chemistry changed introduced from bay.
2015-07-26 22:01:35 -04:00
Neerti
94a2ec5bf1
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2
...
Conflicts:
.travis.yml
polaris.dme
2015-07-26 16:01:27 -04:00
Neerti
6eece8ac45
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/16/2015_bay_merge_2
...
Conflicts:
.travis.yml
polaris.dme
2015-07-16 22:46:53 -04:00
Neerti
70cda5e3be
Adds a few new posters.
2015-07-16 21:12:43 -04:00
Woodrat
88022ed6fc
Neerti is Satan and I fucked up?
2015-07-07 20:48:28 -07:00
Woodrat
c5b30257f7
Neerti is Satan, updates map. Updates files.
2015-07-07 20:31:00 -07:00
Neerti
91da4afcac
Removes machinedir on in machine_processing.dm and machine_stacking.dm
2015-07-07 18:43:59 -04:00
Neerti
a8534ef516
Adds new z-level, adds nonfunctional elevator.
2015-07-03 03:05:27 -04:00
Neerti
a0fdf03760
Adds Woodrat's centcom z-level and some other stuff on the first one.
2015-07-02 23:27:48 -04:00
Neerti
462eaa834b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync
...
Conflicts:
.travis.yml
code/modules/clothing/spacesuits/rig/modules/combat.dm
code/modules/clothing/spacesuits/rig/modules/utility.dm
code/modules/mob/living/silicon/ai/ai.dm
icons/mob/rig_back.dmi
polaris.dme
2015-06-25 18:50:18 -04:00
Neerti
0a7f5b42cb
Converts woodrat's map to this codebase after 12 hours nonstop of fixing it.
...
Cryo is a huge asshole and I had to make a quick hack because twelve hours etc.
2015-06-22 11:05:35 -04:00
Neerti
2a45114038
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/5/2015_bay_merge
...
Conflicts:
.travis.yml
code/controllers/configuration.dm
code/datums/supplypacks.dm
code/game/machinery/bluespacerelay.dm
code/game/machinery/hologram.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/circuitboards/machinery/commsantenna.dm
code/game/turfs/simulated/floor.dm
code/game/turfs/simulated/floor_types.dm
code/game/turfs/simulated/walls.dm
code/global.dm
code/modules/clothing/spacesuits/rig/suits/ert.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/research/designs.dm
config/example/config.txt
icons/mob/feet.dmi
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/shoes.dmi
icons/obj/clothing/suits.dmi
icons/obj/rig_modules.dmi
interface/interface.dm
maps/exodus-3.dmm
polaris.dme
2015-06-05 22:11:15 -04:00
Neerti
cfe4bca21b
Removes maps/exodus-3.dmm
2015-05-10 05:04:01 -04:00
Neerti
6906acf193
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two
...
Conflicts:
code/game/turfs/simulated/floor.dm
icons/mob/back.dmi
maps/exodus-3.dmm
polaris.dme
2015-05-10 04:21:37 -04:00
Neerti
7277795869
Adds a statue that is not Tyler Corbin. Nope. *cough*
2015-05-10 03:29:56 -04:00
SinTwo
c4755548da
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
...
Conflicts:
maps/exodus-2.dmm
2015-05-03 16:09:58 -04:00