PsiOmegaDelta
cb1e57eb4e
Law spelling corrections, removes some law sets from the law manager overview.
2015-07-14 09:01:13 +02:00
PsiOmegaDelta
8da7141af1
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-07-14 08:11:11 +02:00
Zuhayr
cd380aba24
Removed the last few references to MODE, fixed some oversights with player_is_antag().
2015-07-14 05:19:00 +09:30
Zuhayr
7bb9ca6ec2
Fixes #10129
2015-07-14 05:18:58 +09:30
PsiOmega
b1c26003d0
Further improves the server revision verb.
...
Now also includes the current branch name.
2015-07-13 12:18:09 +02:00
PsiOmegaDelta
16abe8148a
Relocates drone law update to the new law set location.
2015-07-08 08:58:38 +02:00
Dragor
2c61ae8e12
Rewording of maintenance drones
...
Just slight rewording of a law to make clearer that they shouldn't interact with crew at all.
2015-07-05 00:07:55 +02:00
Zuhayr
8ab80b7394
Removes the RUST engine.
2015-07-01 15:50:55 +09:30
Zuhayr
ec5e05b9f1
Antagonist system refactor. Fixes #9495 , #9290 , #9521 , #8800 and #9465 .
2015-06-21 18:08:26 +09:30
Zuhayr
cef958cac2
Fixes #9503
2015-06-10 23:14:33 +09:30
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
PsiOmegaDelta
12d1277925
Merge pull request #9577 from Zuhayr/dev-freeze
...
Fixes
2015-05-30 08:35:39 +02:00
Zuhayr
eaf7e6718d
Merge pull request #9553 from GinjaNinja32/reagent_protection
...
Fixes #5945 , de-copy-pastes parapens and sleepypens
2015-05-30 13:57:31 +09:30
Zuhayr
a4c2267984
Fixes #9386
2015-05-30 04:01:13 +09:30
PsiOmega
4ce737d87d
Server build date and revision.
...
Can now see the current compilation date and revision:
* In the Dream Daemon log output.
* By using the "Show Server Revision" client verb which also links you to the commit in question.
2015-05-29 08:26:31 +02:00
GinjaNinja32
86f52910a1
Fixes #5945 , de-copy-pastes parapens and sleepypens
...
Harm-syringes, hyposprays, parapens and sleepypens now all respect armour, and produce admin logs for transferred reagents if any are transferred.
2015-05-28 22:23:37 +01:00
Atlantis
97f0470504
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge
2015-05-22 21:01:26 +02:00
Zuhayr
93b014c699
Merge with dev.
2015-05-20 13:39:31 +09:30
Chinsky
33e8791fe9
Merge pull request #9264 from Hubblenaut/airlocks
...
Fixes airlock wires
2015-05-18 18:21:05 +03:00
Hubblenaut
86426d0424
Fixes airlock wires and adds backup power light
2015-05-18 16:55:12 +02:00
Chinsky
a3a2c615de
Merge pull request #9300 from PsiOmegaDelta/RoundStart
...
Gamestart cleanup.
2015-05-18 12:00:49 +03:00
Zuhayr
358867f3b5
Major sheet and material refactor.
2015-05-17 01:46:53 +09:30
Zuhayr
a101855343
Converted over hatchets and scythes.
2015-05-17 00:15:46 +09:30
PsiOmega
bc0e87ceaa
Destroying a camera now also cuts wires randomly.
2015-05-16 11:04:32 +02:00
PsiOmega
729a7a3ec9
Gamestart cleanup.
...
* setup_economy() was called twice.
* Game state is set to playing just before creating characters, this ensures equipment such as headsets initialize properly().
* Removes the sleep in manifest creation. Prevents duplicate manifest entries from occurring if one joins within 4 seconds of round start.
2015-05-16 10:59:45 +02:00
Kelenius
10915eae24
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/game/objects/effects/chem/chemsmoke.dm
code/modules/customitems/item_defines.dm
code/modules/projectiles/guns/launcher/syringe_gun.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
code/modules/reagents/reagent_containers/food/drinks.dm
code/modules/reagents/reagent_containers/pill.dm
maps/exodus-1.dmm
2015-05-15 11:28:05 +03:00
Chinsky
8d83e8d452
Merge pull request #9202 from Zuhayr/customitems
...
Custom items refactor.
2015-05-14 21:47:04 +03:00
Zuhayr
1dfade1a33
master>dev
2015-05-13 17:09:57 +09:30
Atlantiscze
090112c874
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge
2015-05-13 06:17:26 +02:00
Zuhayr
a9f936fe42
Added exosuit customisation kits to cargo.
2015-05-13 11:20:54 +09:30
Zuhayr
eef2f589ce
Housekeeping.
2015-05-13 10:32:26 +09:30
Zuhayr
4e85c5f387
Dev merge.
2015-05-12 23:33:29 +09:30
Chinsky
86c8c8c52b
Changed similar proc in datacore to just use icons of actual human it gets. Works fine for both latejoin and roundstart.
...
Also fixed a runtime, somehow head was created without a tajaran and got lost.
2015-05-12 06:42:08 +03:00
Zuhayr
4cf296a6c9
First pass on custom item cleanup/refactor.
2015-05-12 10:53:16 +09:30
mwerezak
56c610e111
Updates weed control crate
...
Removes the scythe from the weed control crate and replaces it with hatchets and plantkiller spray bottles.
2015-05-11 21:20:16 -04:00
Atlantis
152156018a
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge
2015-05-11 07:46:51 +02:00
Atlantiscze
024dabef7b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge
2015-05-05 22:13:58 +02:00
PsiOmega
27b917ed6c
Teleport cleanup.
...
Teleporter code now uses:
Absolute paths.
Span classes.
Configured Z-levels to determine valid destinations, as opposed to hardcoded.
2015-05-05 09:55:19 +02:00
Kelenius
317abc6b79
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/datums/recipe.dm
code/game/machinery/bots/farmbot.dm
code/game/machinery/bots/medbot.dm
code/game/mecha/equipment/tools/tools.dm
code/game/objects/effects/chem/chemsmoke.dm
code/game/objects/effects/effect_system.dm
code/game/objects/items/toys.dm
code/game/objects/items/weapons/extinguisher.dm
code/game/objects/items/weapons/mop.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/organs/organ_internal.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Recipes.dm
code/modules/reagents/reagent_containers/food/snacks.dm
code/modules/reagents/reagent_containers/pill.dm
code/modules/reagents/reagent_containers/spray.dm
maps/exodus-1.dmm
2015-04-28 10:49:26 +03:00
PsiOmega
fe09ed1a22
Merge remote-tracking branch 'upstream/dev' into BorgModules
...
Conflicts:
code/game/objects/items/robot/robot_upgrades.dm
code/modules/mob/living/silicon/ai/subsystems.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/silicon/robot/robot_upgrades.dm
2015-04-26 15:52:18 +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
a6a428af6a
Mecha + misc. Destroy() because I had already begun.
2015-04-17 09:55:59 +02:00
PsiOmega
d3b000f2cc
Ensures Admin Deletes uses qdel.
...
Ensures that Destroy() is properly called, for types implementing it.
2015-04-16 12:56:24 +02:00
Zuhayr
7129feb417
Removed some cocked up files.
2015-04-13 22:58:32 +09:30
Zuhayr
a029f88cfc
Added construction drone variant, updated the construction area map slightly.
2015-04-11 19:20:13 +09:30
Chinsky
7b15bd59e5
Merge pull request #8768 from Yoshax/emergencymessage
...
Emergency message changes
2015-04-09 08:15:19 +03:00
PsiOmega
66c56926d0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/gamemodes/cult/runes.dm
2015-04-08 10:40:38 +02:00
Mustafa Kalash
177d968933
Changes flour sacks to a condiment, so that players will be able to pour flour straight into beakers, instead of having to use the grinder first.
2015-04-06 18:40:11 -04:00
Yoshax
5a34b1481b
Big emergency message changes
2015-04-06 20:17:18 +01:00
PsiOmega
036a948372
Rune logging.
...
Adds various rune logging.
2015-04-06 09:44:56 +02:00
