mwerezak
b9ee4ebc5e
Merge branch 'master' into abandonedcrates
2015-09-10 15:21:15 -04:00
mwerezak
67fd31bd3e
Abandoned crates now again use unique digits for their codes
2015-09-10 00:42:14 -04:00
PsiOmegaDelta
2007004f3c
Qdel cleanup.
...
Replaces a few instances of del() with qdel().
2015-09-09 12:20:33 +02:00
mwerezak
0ceb0e291d
Fixes #10314
...
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
2015-08-02 00:01:10 -04:00
Mloc
1d8e015334
fixes #10141
...
also clean up alloy_data handling
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-27 10:49:51 +01: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
mwerezak
0fc12eb22b
Fixes #9927
...
Fixes issues with deca code crates.
2015-07-13 00:45:36 -04:00
PsiOmegaDelta
339d08b20e
Compilation fix.
2015-07-11 10:51:03 +02:00
PsiOmegaDelta
5575acccfd
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-07-11 09:51:24 +02:00
Loganbacca
09f502f8d7
Fixed spriteless item in xenoarch loot drop
2015-07-11 03:38:20 +12:00
mwerezak
f8d5127078
Adds SLOT_EARS to various items
2015-06-21 01:45:43 -04:00
Zuhayr
ed34aa2466
Rebalancing and adjusting divisors for all weapon damage values.
2015-05-17 16:51:55 +09:30
Zuhayr
358867f3b5
Major sheet and material refactor.
2015-05-17 01:46:53 +09:30
Zuhayr
8aa24b86bb
Renamed shards, katanas, claymores.
2015-05-16 20:36:33 +09:30
Zuhayr
3184f157e9
qdel
2015-05-12 13:12:58 +09:30
Zuhayr
495952ff5d
Changed steel material name to a define.
2015-05-12 13:08:41 +09:30
Zuhayr
e28acd5045
Dev merge.
2015-05-11 18:45:14 +09:30
Zuhayr
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
Mloc
16d50c645d
new object-based lighting system
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 20:54:25 +01:00
PsiOmega
1c38be5cfd
Crayons are now children of pens.
2015-05-05 08:41:24 +02: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
e54fbcb9ec
Cleans up borg module code and responsibilities.
2015-04-26 12:00:30 +02:00
Zuhayr
79e3acc95e
Finalized wall refactor.
2015-04-26 12:58:57 +09:30
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
Zuhayr
12cb60daa3
First pass on wall refactor/mining changes.
2015-04-26 12:53:03 +09:30
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
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
mwerezak
398459c2e7
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/modules/organs/organ_external.dm
2015-03-31 02:13:22 -04:00
mwerezak
9b2f5cea33
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/game/gamemodes/revolution/rp-revolution.dm
code/game/machinery/kitchen/juicer.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/structures/stool_bed_chair_nest/stools.dm
code/modules/destilery/main.dm
code/modules/hydroponics/biogenerator.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/mob/living/carbon/monkey/inventory.dm
code/modules/projectiles/guns/launcher/pneumatic.dm
2015-03-31 01:37:55 -04:00
mwerezak
cdfce64ad0
Replaces uses of u_equip() with remove_from_mob() or drop_from_inventory(), where appropriate.
2015-03-30 22:05:00 -04:00
Chinsky
e3ad4dc013
Fixed #8602
2015-03-30 21:59:50 +03:00
Zuhayr
8f242740a8
Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.
2015-03-28 11:01:11 +10:30
Kelenius
78bac425ad
Updates drill and scanner
2015-03-24 18:34:26 +03:00
mwerezak
3bf5a5ca99
Updates storage costs
...
Storage cost of an item is now twice that of the next smallest item, instead of being equal to the w_class.
Items with w_class 1 or 2 are unaffected. This produces much better behaviour for containers that are limited
by storage space instead of slots, such as how toolboxes are planned to work in a future update.
2015-03-05 10:40:25 -05:00
PsiOmega
e7653e1ed5
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-02-26 08:22:25 +01:00
mwerezak
6d15809768
Corrects return values for the Topic procs of several computers and some other machines as well.
2015-02-25 21:32:35 -05:00
Atlantiscze
2d4926f72d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power
2015-02-17 16:05:47 +01:00
Zuhayr
a8089d4437
Merge master into dev.
2015-02-12 23:01:08 +10:30
Atlantiscze
89496ce927
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power
2015-02-11 01:49:06 +01:00
Atlantiscze
12be20ed73
Mapping changes preparation
...
- Adds Red and Blue simple pipes for mapping use.
- Adds empty CO2 PH and N2O canisters for mapping use.
- Reworks asteroid outpost areas. Old areas kept in separate file for downstream compatibility
- Modifies engineering shuttle to work with next commit.
- SMESs no longer have to be charged above certain level (~5%?) to actually begin outputting power.
- Fixes SMES related bug caused by previous commit
2015-02-09 18:53:02 +01:00
Chinsky
30de86c081
Accessories update.
...
Moves them away from 'tie' legacy - path change, and different code files.
Changed single hastie var into accessories list, to allow multiple articles worn at same time. Updated all affected places in code to work with it.
Currently any number of decorative accessories can be attached, one utility (holster/webbing) and one armband.
2015-02-08 12:35:50 +03:00
Kelenius
71dabeb557
Fixes ore scanner
...
Before: it didn't scan dark tiles and the tile you were standing on.
Now: scans both.
2015-02-08 05:52:12 +03:00
PsiOmegaDelta
1eaf311b25
Merge pull request #7887 from Zuhayr/pickaxes
...
Renames pickaxes to drills, resprites accordingly.
2015-02-04 06:32:37 +01:00
Zuhayr
11ec632c22
Merge branch 'randmap' of https://github.com/Zuhayr/Baystation12 into randmap
2015-02-04 11:03:44 +10:30
Zuhayr
3402912335
Merge with dev.
2015-02-04 11:03:13 +10:30
Chinsky
5ed006bcf0
Merge pull request #7902 from Kelenius/ofCratesAndMastermind
...
Changes abandoned crate contencs and replaces minispess with mastermind
2015-02-03 18:15:35 +03:00
Kelenius
10de826ca3
Removes FPRINT and TABLEPASS flags
2015-01-23 22:27:32 +03:00
Kelenius
c444dc5f41
Updates crate contents
2015-01-23 20:42:21 +03:00
Zuhayr
cd494cdef1
Added masking turf for asteroid field, fixed issues with distribution map. Replaced asteroid field with mask turf.
2015-01-23 13:40:05 +10:30
Zuhayr
07793edc85
Converted mining map over to this new system. Currently broken.
2015-01-23 13:40:03 +10:30
