comma
1a03079a66
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into viro
...
Conflicts:
maps/tgstation.2.1.0.0.1.dmm
2013-07-09 23:08:41 +04:00
fauxtada
c41abfc929
Edits contents of virology biohazard closets to be more virus resistant. Now with robust internals!
2013-07-09 07:02:17 -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
Spamcat
df90824d60
Whoa, 2 barsign.dm's? WTF?
2013-07-08 23:25:13 +04:00
Zuhayr
9dec8e311c
Merge pull request #3252 from Segrain/bleeding-edge-freeze
...
Examining cyborgs.
2013-07-06 00:30:09 -07:00
Spamcat
5f690e150d
Part 3: fixing shit
2013-07-06 02:53:06 +04:00
Spamcat
63de302a09
Part 2: construction.
2013-07-06 02:53:03 +04:00
Spamcat
0e4271f97c
Stage 1: deconstruction.
2013-07-06 02:53:01 +04:00
Spamcat
87feed7e7b
Nice colours (and a minor bugfix)
2013-07-06 02:53:00 +04:00
LordBraindead
ff912e132b
readjusted composition of syndie bombs
...
set them to produce a 1-2-5 explosion for the fire changes
2013-07-05 19:55:28 +01:00
Segrain
5abed5a5f6
Modtype tweak.
2013-07-05 20:10:39 +03:00
LordBraindead
ba15e0f515
readjusted composition of syndie bombs
...
set them to produce a 1-2-5 explosion for the fire changes
2013-07-05 09:06:34 +02: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
Whitellama
6d8654eb7a
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
html/changelog.html
2013-06-30 20:02:36 -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
Zuhayr
3192323c19
Fixes #3200
2013-06-29 16:57:08 -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
Whitellama
41c8e8fe3f
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-25 16:47:15 -07: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
Segrain
29903c46e3
Quickfix for multitile doors.
2013-06-25 11:40:01 +03:00
Whitellama
f3224bba2e
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-24 21:48:33 -07:00
SkyMarshal
aa85e757d4
Added a better framework for multi-tile doors, pulling works strangely though.
2013-06-24 17:21:55 -07:00
Zuhayr
f5cc695c19
Merged airlock assembly changes and ZAS changes, hopefully.
2013-06-24 21:06:51 -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
SkyMarshal
702fea234a
Forgot the files, doh!
2013-06-23 19:53:59 -07: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
meyar
7647dbd9ab
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-06-23 00:16:57 -04:00
Zuhayr
be16c8eff3
Fixes #2957
2013-06-22 20:07:21 -07:00
Whitellama
83ab2c430b
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-22 00:19:43 -07:00
meyar
accc3447dd
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-22 02:29:26 -04:00
