PsiOmegaDelta
8457488755
Re-adds the Clamp defines.
2015-07-11 11:23:55 +02:00
PsiOmegaDelta
1287ad818a
Ninjas can no longer teleport unto turfs that contain solid objects.
2015-07-11 11:12:08 +02:00
PsiOmegaDelta
9b4d09c974
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/unsorted.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/grenades/emgrenade.dm
code/modules/clothing/spacesuits/rig/rig_attackby.dm
2015-07-11 10:58:49 +02:00
Zuhayr
946c445b29
Fixes #9896
2015-07-10 01:14:12 +09:30
PsiOmegaDelta
df83203356
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/hydroponics/seed_mobs.dm
code/modules/materials/materials.dm
2015-07-09 08:45:49 +02:00
Atlantis
e37503dedb
Fixes #9965
...
- Hardsuit injectors now only work on carbon-based mobs. This prevents injecting of AIs, Robots and other silicon-based mobs.
2015-07-08 21:44:04 +02:00
mwerezak
0bc7ce1119
Makes breacher rigs fit unathi only
2015-06-27 00:44:03 -04:00
Neerti
ceb1832505
Tries to please Travis.
2015-06-25 20:22:52 -04:00
Neerti
fcde61acdd
Fixes the sloppy merge conflict resolution.
2015-06-25 19:14:15 -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
Mustafa Kalash
ac032f70fc
Changes the module from a watch to the horrible tie. Renames module to augmented tie. Moves module to the ERT ready room.
2015-06-20 14:26:37 -04:00
Mustafa Kalash
bb370a66f3
Merge remote-tracking branch 'upstream/dev' into iaasuit
2015-06-20 14:07:44 -04:00
Zuhayr
6f00d831e5
Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct
...
Base proc: emag_act
2015-06-21 01:18:25 +09:30
PsiOmegaDelta
cc7c502fb8
Updates emag attackby usages to emag_act where it's not too much of a headache.
2015-06-16 09:34:13 +02:00
PsiOmega
0a05c2659f
All the span-corrected dm files.
2015-06-14 22:08:14 +02:00
Mustafa Kalash
ca4265f157
Typo fix.
2015-06-12 15:39:51 -04:00
Mustafa Kalash
cc56480f99
Adds an Internal Affairs hardsuit; adds a mounted pen, stamp, paper dispenser, and flash; maps in the IA hardsuit; and adds a pen which can cycle through the three colors.
2015-06-11 23:31:25 -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
PsiOmega
5e84bfa57c
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/clothing/spacesuits/rig/suits/ert.dm
2015-05-30 15:59:54 +02:00
Raptor1628
62ef32a725
Rig Icon Fixes
...
Fixes some incorrect names that were resulting in broken icons.
2015-05-27 23:32:27 -04:00
mwerezak
d65ec62dcb
Fixes #9493
2015-05-26 22:49:16 -04:00
PsiOmega
c21a456379
Fixes #9447 .
...
The inteliCard now has a NanoUI interface, allowing it to utilize custom CanUseTopic() checks depending on context, in-hand or in-rig.
2015-05-24 11:33:54 +02:00
PsiOmega
e74c0e65bf
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/power_cells.dm
2015-05-22 08:26:13 +02:00
mwerezak
e23f5e7e06
Fixes hardsuit shocking
2015-05-18 20:09:31 -04:00
Zuhayr
358867f3b5
Major sheet and material refactor.
2015-05-17 01:46:53 +09:30
Zuhayr
150b24023e
Renamed kitchen utensils.
2015-05-16 21:24:36 +09:30
Zuhayr
325bd42c66
Fixes #9233
2015-05-15 23:37:52 +09:30
Zuhayr
624a6b0bca
Fixes #9250
2015-05-15 18:26:53 +09:30
PsiOmega
f9306431b7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
2015-05-14 22:20:58 +02:00
PsiOmega
91f67e5dc5
Adjusts rig stealth module costs.
...
Activation and active power costs were previously a tenth of the same costs for a mere energy blade.
Now costs matches that of an energy blade.
2015-05-13 22:38:52 +02:00
Zuhayr
495952ff5d
Changed steel material name to a define.
2015-05-12 13:08:41 +09:30
Zuhayr
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
SinTwo
52902b5195
Update utility.dm
2015-05-04 00:26:49 -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
SinTwo
4555eb19da
Moar Janitor ERT
2015-05-03 15:23:18 -04:00
SinTwo
7df732434d
Janitor ERT
...
Because.
2015-04-26 14:37:44 -04:00
Zuhayr
dbf8e53020
Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores.
2015-04-26 12:53:26 +09:30
PsiOmega
1fea589ad7
Merge remote-tracking branch 'upstream/dev' into TheSummoning
...
Conflicts:
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/clown_items.dm
2015-04-24 17:13:37 +02:00
PsiOmega
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
PsiOmega
08fa1193ce
Adds Hardsuit Module tab.
...
Allows one to (de)activate, engage, select and change module charges from the "Hardsuit Modules" tab panel.
Basic idea similar to spells.
2015-04-16 08:54:04 +02:00
PsiOmega
49d3f0fcf7
Merge remote-tracking branch 'upstream/dev' into NanoRefactorUmptheen
2015-04-10 15:49:36 +02:00
PsiOmega
1ba8dcbca9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/vending.dm
2015-04-10 15:25:34 +02:00
PsiOmega
e37c5c22d4
Refactors NanoUI interaction (again)
...
Takes NanoUI interaction code and splits it into more manageable modules.
The default handler that checks distances, camera coverage, etc., etc.
Admin NanoUI windows now only check for admin rights, ignoring sight, distance, and anything else.
ERT/mercenary appearance changer now remains open for as long as the mob remains on the admin Z-level.
PDAs and uplinks now require that you keep the item somewhere in your main inventory (or contents to be precise). Hands or ears are fine, inside bags are not.
Rig suits also check that they are in the operator's inventory or that the synthetic operator is somewhere within the suit's contents (recursively).
2015-04-10 11:19:38 +02:00
GinjaNinja32
7483b9fcb2
Fixes hardsuits completely breaking all the time
2015-04-09 13:58:10 +01:00
PsiOmega
71a8ddf50e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/modules/paperwork/paper.dm
code/modules/projectiles/projectile.dm
2015-04-08 10:55:26 +02:00
PsiOmegaDelta
fd1b6343f0
Merge pull request #8655 from volas/sanitize_procs2
...
sanitize(), part 2
2015-04-06 15:16:17 +02:00
Chinsky
ae75e3555e
Merge remote-tracking branch 'remotes/upstream/dev-freeze' into conscience
...
Conflicts:
code/modules/mob/living/carbon/human/human_attackhand.dm
2015-04-05 05:23:14 +03:00
Raptor1628
cf74e22870
Hardsuit Stuff
...
Icons for all modules and control modules, two new suits, some modified
stats. Station suits are now split, with their spawned "equipped"
version having modules and access requirements, and their parent type
having neither.
2015-04-04 17:59:10 -04:00
PsiOmega
8e55ad8114
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/mob.dm
2015-04-03 09:33:05 +02:00
volas
2622d2dbfc
sanitize() refactor: fourth pass
2015-04-03 00:40:57 +03:00
