3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
317eaf4771
Merge pull request #10101 from mwerezak/shards
...
Refactors obj flags and changes defined bitflag representation
2015-08-20 19:47:58 +03:00
c8b6813426
Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery
...
Uplink Items - Part III
2015-08-20 19:19:12 +09:30
2cb46e035c
Removes unused obj flags and fixes overlapping flags
...
Removes ONESIZEFITSALL and NOSHIELD, which were unused.
2015-08-18 17:08:41 -04:00
e92e819bd9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-18 18:29:01 +02:00
8138815dc3
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-18 18:05:16 +02:00
afc5414ed9
Removes a few outdated mob mentions. Fixes a few things. Almost definitely fixes #7570 .
2015-08-18 10:48:22 +03:00
7c1d9b5614
Mech chargers are now a single machine
...
Can be built and upgraded
Resolves #5215
2015-08-16 06:07:36 -07:00
c8baafed2a
Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and
...
construction/deconstruction. Major map rework/changes.
2015-08-16 06:05:21 -07:00
0380d5d9d4
Completes the feature where mercenaries can setup fake crew announcements and records.
2015-08-14 13:42:11 +02:00
db565ae2ff
Merge remote-tracking branch 'upstream/dev' into 150703-Uplinkery
...
Conflicts:
code/datums/datacore.dm
code/defines/obj.dm
2015-08-13 08:11:32 +02:00
9e46dfbb56
Re-arranges data record and crew arrival announcement code.
2015-07-28 11:27:44 +02:00
cee5f1a057
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items.dm
2015-07-06 18:33:09 +02:00
25a4fb7d9a
Adds 'Provisional' to the list of acting rank prefixes
2015-07-05 12:29:46 +01:00
8c51676722
Uplink Items - Part III
...
Phase III of the antag uplink additions.
Currently contains proof-of-concept falsified announcements.
2015-07-03 16:02:02 +02:00
4a2d7b661e
Merge pull request #9812 from PsiOmegaDelta/150614-MakingYourLifeEvenEasierApplyDirectlyToForehead
...
Refactors Life() - Part II
2015-06-28 20:20:49 +09:30
48cf00ca54
Merge with dev-freeze.
2015-06-21 20:45:47 +09:30
2f1a6eaf83
Adjusts w_class of beach ball and scroll
2015-06-21 01:46:10 -04:00
6ed7cee041
mob/living/Life() now handles even more regular hud updates. Relocates action handling.
2015-06-17 16:09:13 +02:00
fc6de24042
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/materials/material_sheets.dm
code/modules/organs/organ_icon.dm
code/setup.dm
2015-06-07 10:51:41 +02:00
0725b0cc3e
Moves admin attack log helpers to admin module, makes admin_attack_log more resilient against null arguments
2015-06-06 11:53:12 -04:00
314a28fa75
Merge remote-tracking branch 'upstream/dev' into span_class=notice
...
Conflicts:
code/game/antagonist/station/rogue_ai.dm
code/game/machinery/OpTable.dm
code/game/machinery/floodlight.dm
code/game/machinery/spaceheater.dm
2015-06-02 17:33:20 +01:00
c1ce2f02b7
reorganize xgm into its own module
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-06-02 16:29:23 +01:00
d0232732d4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/floodlight.dm
code/game/objects/items/devices/suit_cooling.dm
code/modules/organs/subtypes/diona.dm
code/modules/paperwork/pen.dm
code/modules/reagents/reagent_containers/hypospray.dm
html/changelogs/.all_changelog.yml
2015-05-30 16:11:57 +02:00
e8f02b8496
Minor folders. code/defines, code/FEA, code/__HELPERS, code/_onclick, code/TriDimension, code/ZAS
2015-05-29 20:36:48 +01:00
76daebe0db
More consistent logging via admin_inject_log proc
2015-05-29 16:57:42 +01:00
62185bc0a8
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-05-26 08:35:32 +02:00
c08774d96e
Updates bear traps
...
Moves to trap.dm.
Cleans up trap attacking code.
Fixes trap remaining anchored once triggered.
Instead of embedding, traps now buckle their victim into place.
Deaf messages, where appropriate.
Gave beartraps a more setting-friendly name.
Conflicts:
baystation12.dme
2015-05-24 16:33:41 -04:00
3bdb5ff9ea
Merge branch 'dev' into ofResearchAndPrototypes
...
Conflicts:
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/stacks/sheets/leather.dm
code/game/objects/items/stacks/sheets/mineral.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/items/weapons/kitchen.dm
code/modules/hydroponics/trays/tray_tools.dm
code/modules/research/circuitprinter.dm
code/modules/research/protolathe.dm
code/modules/research/rdconsole.dm
2015-05-22 19:26:39 +03:00
35a20002c6
Merge branch 'dev' into ofResearchAndPrototypes
...
Conflicts:
baystation12.dme
code/defines/obj/weapon.dm
code/game/mecha/equipment/tools/medical_tools.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/mecha.dm
code/game/mecha/mecha_parts.dm
code/game/objects/items/devices/flash.dm
code/game/objects/items/devices/powersink.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
code/game/objects/items/weapons/circuitboards/machinery/power.dm
code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
code/game/objects/items/weapons/circuitboards/machinery/research.dm
code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
code/game/objects/items/weapons/flamethrower.dm
code/game/objects/items/weapons/handcuffs.dm
code/game/objects/items/weapons/kitchen.dm
code/game/objects/items/weapons/shields.dm
code/game/objects/items/weapons/storage/backpack.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/objects/items/weapons/teleportation.dm
code/game/objects/items/weapons/tools.dm
code/modules/assembly/igniter.dm
code/modules/assembly/infrared.dm
code/modules/assembly/mousetrap.dm
code/modules/assembly/proximity.dm
code/modules/assembly/signaler.dm
code/modules/assembly/timer.dm
code/modules/assembly/voice.dm
code/modules/clothing/glasses/glasses.dm
code/modules/hydroponics/trays/tray_tools.dm
code/modules/mining/drilling/scanner.dm
code/modules/mining/mine_items.dm
code/modules/mining/ore.dm
code/modules/mob/living/silicon/robot/analyzer.dm
code/modules/power/rust/circuits_and_design.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/projectiles/guns/energy/laser.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/energy/stun.dm
code/modules/research/circuitprinter.dm
code/modules/research/designs.dm
code/modules/research/destructive_analyzer.dm
code/modules/research/protolathe.dm
code/modules/research/rdconsole.dm
code/modules/research/research.dm
code/modules/research/server.dm
code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
2015-05-20 11:50:28 +03:00
93b014c699
Merge with dev.
2015-05-20 13:39:31 +09:30
8e5f5ef8e0
Merge pull request #9165 from Yoshax/trapping
...
Makes bear traps do damage when stepped on
2015-05-19 01:43:05 +03:00
c2200109d0
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/twohanded.dm
2015-05-18 17:50:48 +02:00
229087c269
Update statistics.dm
2015-05-17 10:36:20 +01:00
a32179a062
Renamed knives.
2015-05-16 20:54:34 +09:30
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
a7d0047b27
Fixes a problem with sql population logging where players and admins are placed on different rows
...
Replaces two procs:
proc/sql_poll_admins()
proc/sql_poll_players()
With the proc:
proc/sql_poll_population()
Which does the same thing, except fixes and issue with sql logging, where player counts and admin counts would be placed in different rows:
Pictures for comparison:
Before: https://i.imgur.com/As4hAV8.png
After: http://i.imgur.com/ssm20IQ.png
2015-05-13 20:46:36 +01:00
ad67215b08
Merge pull request #9073 from PsiOmegaDelta/QDels
...
Implementing Destroy():s
2015-05-12 18:26:57 +03:00
495952ff5d
Changed steel material name to a define.
2015-05-12 13:08:41 +09:30
9bdfeb5ab1
Adds if statement
2015-05-11 13:16:07 +01:00
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
cb8a4c7d75
Removes redundant proc call
2015-05-10 22:03:10 +01:00
5ff5214528
Removes redundant var
2015-05-10 20:51:36 +01:00
b0d10a6508
Fixes some stuff (+2 squashed commit)
...
Squashed commit:
[f63e170] Removes unnecessary /
[ac1b52c] re adds 1 bear trap i somehow accidently removed
2015-05-10 20:43:36 +01:00
86bf94ba07
Refactors bear traps
2015-05-10 20:09:29 +01:00
6c121d232b
Makes bear traps do damage when stepped on
2015-05-09 19:57:01 +01:00
75b5cf0b1e
Acting jobs now sort with non-acting jobs on the manifest.
2015-05-09 15:36:04 +01:00
6f9da12276
Implementing Destroy():s
...
First out: APCs, security camera consoles, vents.
2015-05-03 10:45:35 +02:00
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
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
Zuhayr
