Zuhayr
4e85c5f387
Dev merge.
2015-05-12 23:33:29 +09:30
Zuhayr
49930fe55d
Debugging!
2015-05-12 21:30:06 +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
4cf296a6c9
First pass on custom item cleanup/refactor.
2015-05-12 10:53:16 +09:30
Zuhayr
e28acd5045
Dev merge.
2015-05-11 18:45:14 +09:30
PsiOmega
d14904e1d6
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/game/response_team.dm
code/modules/hydroponics/spreading/spreading.dm
code/modules/mob/dead/observer/observer.dm
2015-05-11 09:28:59 +02:00
PsiOmega
d1eae14343
Fixes #9183
...
Very critical. No lewdness allowed.
2015-05-11 09:08:27 +02:00
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
Chinsky
8294f02c1b
Merge pull request #9072 from PsiOmegaDelta/BrokenGrills
...
Grilles and rod tweaks.
2015-05-04 21:25:24 +03:00
PsiOmega
1edb39b556
Merge remote-tracking branch 'upstream/dev' into BrokenGrills
2015-05-04 14:58:24 +02:00
RavingManiac
97adee16db
Recursive explosion resistance values for walls, space tiles, grilles and airlocks tweaked
...
Lattices now spawn properly when a floor tile is destroyed by an explosion. Probabilities involved tweaked
2015-05-03 21:53:02 +10:00
PsiOmega
3866fda394
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/ZAS/Turf.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/living.dm
code/modules/recycling/sortingmachinery.dm
2015-05-02 21:50:11 +02:00
PsiOmega
46ad005b50
Adds two missing pooling instances and corrects broken grilles health status.
2015-05-02 21:46:30 +02:00
PsiOmega
ca7fa2aa19
Grilles and rods.
...
Grilles no longer return more rods than they were created from when destroyed (by method other than wirecutters).
Rods are now acquired from and returned to a pool.
Also adds a pre-broken grille for mapping, avoids the case where one might be able to destroy the same grille twice.
2015-05-02 21:35:02 +02:00
mwerezak
b10c64d48b
Adds a closet breakout animation, fixes spamming the breakout proc
2015-05-01 16:19:52 -04:00
mwerezak
98a4f54b88
Adds span classes, moves secure closet procs
2015-05-01 01:23:53 -04:00
mwerezak
cd707d8279
Resist verb cleanup
...
Fixes #8922 and cleans up resisting.
Moves various code pieces to new procs, subtypes, or other objects where
appropriate.
2015-05-01 01:23:26 -04:00
Chinsky
1328414485
Merge pull request #8960 from mwerezak/item-color
...
Fixes #8577 , cleans up item_color, clothing/under and backpacks
2015-04-28 06:25:35 +03: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
PsiOmega
19a981e961
Airlocks can now crush more things.
...
Airlocks can now crush mobs, canisters, closets, and mechas.
Fixes #8983 .
2015-04-26 19:29:13 +02:00
Zuhayr
8e0d0900d9
Merge pull request #8875 from PsiOmegaDelta/TheSummoning
...
Destroy/qdel
2015-04-26 22:14:07 +09:30
mwerezak
229f4cb043
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color
...
Conflicts:
code/modules/customitems/item_defines.dm
2015-04-26 02:04:59 -04: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
173329f675
Merge pull request #8968 from Jarcolr/signed
...
Adds 9 new bar signs.
2015-04-25 03:09:35 +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
e7d85f8edc
Adds Destroys.
2015-04-24 17:11:14 +02:00
Jarcolr
28c037b6ce
Adds 9 new bar signs.
2015-04-24 17:35:07 +03: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
eee67109d1
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/say.dm
2015-04-23 13:15:43 +02: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
f6d0ab1578
Shower curtains no longer lose their default color upon being washed.
...
NT has now invested in slightly less budget curtains.
2015-04-20 14:42:43 +02:00
PsiOmega
516b60962e
Merge remote-tracking branch 'upstream/dev' into CultPorting
2015-04-14 15:54:22 +02:00
PsiOmega
c616b67621
Map fixes.
...
Fixes #8441 .
Fixes #8820 .
Less stacked pipes.
Medbay now powers all its shutters.
Fixes duplicate req_access definitions.
2015-04-13 08:44:13 +02:00
PsiOmega
1511e2b3f4
Ports /vg/'s Nas-Sie remake.
...
Second phase:
New Nar-Sie itself.
Two endgame phase - Nar-Sie and Supermatter Cascade.
Culty mobs.
2015-04-12 16:19:16 +02:00
Zuhayr
0223223c77
Merge pull request #8753 from Neerti/4-4-2015_borg_module_stuff
...
Revenge of the Research Module (and other stuff from that PR)
2015-04-12 13:16:45 +09:30
PsiOmega
f3be9b41f0
Ports /vg/'s Nas-Sie remake.
...
First phase: Port cultify procs.
2015-04-11 13:58:08 +02:00
=
78987a436a
Merge resolution.
2015-04-11 13:23:17 +09:30
Chinsky
be3f372680
Merge pull request #8788 from PsiOmegaDelta/PortedSpells
...
Ports /vg/'s spell system for use by the cult port.
2015-04-11 02:05:58 +03: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
Kelenius
20d62c87ff
Borg module fixes
...
Fixes #8775
Fixes #8797
2015-04-10 09:50:47 +03:00
PsiOmega
990530d118
Ports /vg/'s spell system for the sake of cult porting.
...
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
2015-04-09 20:08:06 +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
Neerti
326fde4c5f
Adds the research module, condensed into one commit so far.
2015-04-04 20:17:59 -04:00
volas
2622d2dbfc
sanitize() refactor: fourth pass
2015-04-03 00:40:57 +03:00
mwerezak
01ce8d4a1f
Fixes #8696
...
Fixes #8696 , and updates other usages of drop_item() where appropriate.
2015-03-31 20:30:06 -04: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
