Mloc-Argent
8575b7a286
And once again, did that the wrong way around. Whoops.
...
Fully reverts #3316 .
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-20 18:41:50 +01:00
Mloc-Argent
adc3c14779
Revert #3316 from BEF due to compile errors and (assumed) missing files.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-20 18:38:00 +01:00
Mloc-Argent
f29cd5946f
Merge branch 'master' into bleeding-edge-freeze
2013-07-19 14:48:40 +01:00
LordBraindead
5d63943d07
Update mineral.dm
...
removed sheettpye = "plastic" again because it snuck back in after being removed already
2013-07-14 21:50:48 +02:00
LordBraindead
53c73f6b85
Update power_cells.dm
...
derped a debug message into the commit
2013-07-14 21:22:09 +02:00
LordBraindead
08d2e22220
fire update
...
enabled fire to destroy floors and objects
also tweaked the behaviour of glass to enable glasslocks against fire
also made fire extingiushers stop being useless
2013-07-14 21:20:45 +02:00
Zuhayr
dbe4838d40
Purging the toddler as Lord Mloc commands.
2013-07-13 04:34:09 -07:00
comma
1095bd1978
Merge branch 'bleeding-edge-freeze' into viro
2013-07-09 12:49:23 +04:00
comma
ae2a9c56ad
Merge branch 'master' into bleeding-edge-freeze
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2013-07-09 12:48:34 +04:00
Zuhayr
9dec8e311c
Merge pull request #3252 from Segrain/bleeding-edge-freeze
...
Examining cyborgs.
2013-07-06 00:30:09 -07:00
Spamcat
87feed7e7b
Nice colours (and a minor bugfix)
2013-07-06 02:53:00 +04:00
Segrain
5abed5a5f6
Modtype tweak.
2013-07-05 20:10:39 +03:00
Zuhayr
1750f1e631
Merge pull request #3244 from Ispil/Staging
...
Fixes issue #3240 . The order for visible_message is visible, person, aud...
2013-07-04 23:09:44 -07:00
Ispil
255408c026
Fixes issue #3240 . The order for visible_message is visible, person, audible. Here, visible and person were reversed.
2013-07-04 21:13:33 -07:00
Spamcat
24eddd6eaa
Now 100% more machinery!
2013-07-05 04:12:41 +04:00
Zuhayr
b4695d3d74
Merge pull request #3232 from Ravensdale/master
...
Custom synthetic sprites and minor bugfixes
2013-07-03 22:21:15 -07:00
Ravensdale
9aedfa8b23
Bugfix: Fixes mining borg's radio to the supply frequency since mining frequency no longer exists.
...
Feature: Introduces and adjusts code for cyborg and AI custom sprites
Cleanup: Streamlined the AI core selection code. Could probably be even cleaner but it's good for now.
2013-07-03 21:24:25 -07:00
Ispil
88791eec5c
Makes the Crew Manifest default on all PDAs, and removes the access_manifest variable from cartridges. Also moves the manifest function into the PDA code, instead of cartridge code.
2013-07-02 19:14:10 -07:00
Spamcat
11e27c5999
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops
...
Conflicts:
code/game/gamemodes/objective.dm
2013-07-01 19:49:29 +04:00
comma
50f94ddd93
Merge branch 'bleeding-edge-freeze' into viro
2013-07-01 17:33:24 +04:00
comma
da884f4ddc
Merge branch 'bleeding-edge-freeze' of https://github.com/comma/Baystation12 into viro
2013-07-01 17:23:09 +04:00
Zuhayr
3fb62273f7
Custom item.
2013-07-01 19:21:49 -07:00
jack-fractal
00db60fa95
This submission modifies the bodybag.dm file to prevent the parent class (bodybag) from having to know about it's child class (cryobag).
...
This also removes redundant defines from cryobag class.
2013-06-29 16:49:48 -04:00
Zuhayr
6fc787ff73
Fixes #3201
2013-06-29 18:09:35 -07:00
Chinsky
051edc2227
Started implementing of ViroDB.
...
-Analyzers now add info about viruses they scan to global list.
-Health analyzers will only find known viruses.
2013-06-28 15:43:58 +04:00
Zuhayr
1d28bb7cb3
Message tweaks.
2013-06-28 15:55:41 -07:00
Zuhayr
c7bbc3c9b3
Changelog.
2013-06-28 15:53:50 -07:00
Zuhayr
58bf2d218c
Bandages and ointment cannot be used through space suits.
2013-06-27 18:02:10 -07:00
Segrain
31e4487229
Fix for #2430 .
2013-06-27 14:10:05 +03:00
cib
b0cabba481
Fixed a severe bug with robot components.
...
There were several desyncs between robot.cell and robot.components["power cell"].installed, leading to very annoying bugs.
2013-06-25 15:00:58 +02:00
SkyMarshal
aa85e757d4
Added a better framework for multi-tile doors, pulling works strangely though.
2013-06-24 17:21:55 -07:00
Segrain
f97f3596a6
Punctuation fix.
2013-06-24 12:03:47 +03:00
Segrain
0d6e49742a
Typo fix.
2013-06-24 06:06:00 +03:00
Segrain
65731b232b
Quickfix and changelog.
2013-06-23 20:52:19 +03:00
Segrain
7fec5309f7
Airlock construction update.
2013-06-23 20:42:58 +03:00
Segrain
1f7d39d99f
Stacks update.
2013-06-23 20:31:55 +03:00
Chinsky
b4822e1600
Merge pull request #3126 from CIB/bleeding-edge-freeze
...
Implemented robot components(organs)
2013-06-22 22:58:04 -07:00
meyar
6f84917a58
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-23 00:17:13 -04:00
Zuhayr
be16c8eff3
Fixes #2957
2013-06-22 20:07:21 -07:00
cib
b58326c8fa
Implemented robot components(organs)
...
Features:
- You now have to open up a cyborg after constructing it and insert all the components
- Cyborgs have per-component damage rather than total damage.
- Too much damage can fry a component, making it non-functional
- Components consume power
- You can disable a component to save power
- Actuator component allows you to move
- Camera component allows you to see
- Comms component allows you to use :b
- Radio component allows you to use radio
- The same placeholder icon for all components
2013-06-22 07:11:02 +02:00
Zuhayr
a16c8e0595
Fixes #3081
2013-06-21 18:00:25 -07:00
Spamcat
2624abdaba
Secbelts now can hold melee weapons.
2013-06-19 15:08:55 +04:00
Spamcat
0dfb5a0583
Whoops :/
2013-06-19 02:58:26 +04:00
Spamcat
6d6becbeed
Made hailers emaggable.
2013-06-19 02:35:32 +04:00
Zuhayr
63b3e44b5c
Bug fixes for embedding/pinning code.
2013-06-18 21:24:26 -07:00
Chinsky
cb7daa77a6
Merge branch 'bleeding-edge-freeze' into viro
2013-06-18 14:55:59 +04:00
Chinsky
fd13ff0d64
Merge branch 'vials' into viro
2013-06-16 11:22:15 +04:00
Chinsky
ca4c3869b9
Merge branch 'bleeding-edge-freeze' into vials
2013-06-16 11:20:45 +04:00
Chinsky
f052d8d972
Added boxes for vials. Usual and secure version(default to viro access)
...
Changed vial lid sprite slightly.
2013-06-16 11:20:32 +04:00
Zuhayr
b1cac56e9a
Merge resolution.
2013-06-15 03:54:22 -07:00
