HarpyEagle
592c824837
Changes paper and paper bundle gender, plus rename
2015-09-26 20:27:57 -05:00
PsiOmegaDelta
3bba0f95b1
Qdels the photo dummy.
2015-08-12 09:14:36 +02:00
Chinsky
076e7d6788
Merge pull request #10432 from Baystation12/dev-freeze
...
Dev freeze -> Master
2015-08-11 20:13:49 +03:00
PsiOmegaDelta
edce8f73a4
Removes faulty attempt of garbage collecting.
2015-08-11 14:26:32 +02:00
PsiOmegaDelta
adda1d9448
Fixes #9158 .
...
Neither the value True nor False are null. Removes breaking null check
2015-08-11 14:00:13 +02:00
PsiOmega
6c891406f9
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/update_icons.dm
code/setup.dm
2015-06-26 19:22:31 +02:00
mwerezak
1b978f9570
Makes update_inv_head() respect item_state and item_icons
...
Fixes #9873
2015-06-26 01:34:15 -04:00
mwerezak
f8d5127078
Adds SLOT_EARS to various items
2015-06-21 01:45:43 -04:00
GinjaNinja32
76daebe0db
More consistent logging via admin_inject_log proc
2015-05-29 16:57:42 +01: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
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
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
PsiOmega
1c38be5cfd
Crayons are now children of pens.
2015-05-05 08:41:24 +02:00
Kelenius
873b38e0a5
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/game/objects/effects/chem/chemsmoke.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
2015-05-04 22:36:35 +03:00
volas
93d120a24c
merge fix
2015-05-02 11:16:15 +03:00
Kelenius
4500eac948
Merge and removal of a wild file
...
Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
code/modules/reagents/Chemistry-Holder.dm
2015-04-29 14:20:44 +03:00
Zuhayr
cc19bbb604
Merge pull request #8972 from DeeUnderscore/paper-functionality
...
Paper functionality additions
2015-04-29 02:46:21 +09:30
Kelenius
a2cea5c49c
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/reagents/Chemistry-Recipes.dm
2015-04-28 19:22:35 +03: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
86d2fa5f61
Build fixes.
2015-04-28 09:04:00 +02:00
PsiOmega
f760d44127
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/objects/items/weapons/candle.dm
code/modules/paperwork/paper.dm
2015-04-28 08:43:31 +02:00
volas
59e17f7a9b
small fix
2015-04-28 00:41:14 +03:00
Daranz
8b792b6361
Merge branch 'dev' into paper-functionality
2015-04-27 12:37:31 -04:00
mwerezak
549270c73c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color
...
Conflicts:
code/game/machinery/washing_machine.dm
code/modules/mob/living/carbon/human/update_icons.dm
2015-04-26 14:53:01 -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
volas
53a95d8eff
Fixes #8913
2015-04-25 22:43:50 +03:00
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
Daranz
12a6797723
Add renaming of things (papers, etc.) in folders
2015-04-23 21:49:56 -04:00
Daranz
1bd25c54e3
Add random access inserting into paper bundles
...
You can now insert papers into paper bundles by clicking on the next page or
previous page link with a sheet of paper in hand.
The bundle window also now correctly updates when the bundle is in a folder.
2015-04-23 21:49:56 -04:00
Daranz
ad51379d86
Make papers in a clipboard renameable without removing
2015-04-23 08:48:52 -04:00
mwerezak
5b037670b3
Removes most instances of item_color
...
Notable exception is for clothing/under, those will have to be removed once item_state override is implemented.
2015-04-22 17:40:27 -04:00
PsiOmega
a4fbb01e2b
Makes it possible to write [date] and [time] to get the current date and time in ISO 8601 format.
2015-04-18 18:40:35 +02:00
volas
2f8bc856a5
Small fix after merge
2015-04-09 21:07:43 +03: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
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
volas
ef105f0659
Additional checks for paper work
2015-04-04 23:47:22 +03:00
volas
2622d2dbfc
sanitize() refactor: fourth pass
2015-04-03 00:40:57 +03:00
Kelenius
41ff9819bd
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
code/modules/organs/organ_internal.dm
code/modules/organs/organ_objects.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/syringes.dm
2015-03-31 17:44:42 +03:00
=
d77010221c
Merge with dev.
2015-03-30 08:36:52 +10:30
Kelenius
24ef7752cd
Merge branch 'Baystation12/dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/mob/living/carbon/monkey/life.dm
code/modules/mob/living/carbon/monkey/monkey.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/glass.dm
2015-03-28 19:14:59 +03:00
Kelenius
b4b635f32d
Chemistry commit
...
I messed something in the git
2015-03-25 19:09:10 +03:00
Zuhayr
97112c8a4c
Replaced display_name with name, worked on severing limbs and damage propagation.
2015-03-25 19:07:22 +10:30
volas
31360a344b
merge fix
2015-03-25 01:13:23 +03:00
volas
e3d41c3112
Merge remote-tracking branch 'upstream/dev' into sanitize_procs
2015-03-25 01:06:32 +03:00
Zuhayr
3fe4162719
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
2015-03-25 00:29:59 +10:30
Zuhayr
a63b9b4e73
Beginning to port over new icon update from limbs branch. WIP
2015-03-24 23:48:54 +10:30
Zuhayr
b9072baa97
Merge with dev.
2015-03-24 14:41:07 +10:30
PsiOmega
bd48c76620
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-23 21:14:32 +01:00
