Zuhayr
ce4f7d4708
Fixes #4979
2014-05-14 17:02:04 +09:30
Zuhayr
5e682668b2
Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable.
2014-05-10 02:10:06 +09:30
Zuhayr
1fc3ecf145
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-05-10 01:56:57 +09:30
Zuhayr
1a24e08f36
Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.
2014-05-10 01:40:11 +09:30
Mloc-Argent
6a11ca32f8
Merge remote-tracking branch 'upstream/master' into dev
2014-05-05 22:22:01 +01:00
Zuhayr
5ef994337b
Fix for previous commit.
2014-05-03 20:13:20 +09:30
Zuhayr
0dfe70fe2b
IPC will no longer take damage from walking in glass. Not sure why this was happening beforehand.
2014-05-03 20:08:45 +09:30
Ccomp5950
976ae06e6b
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/mob/living/say.dm
code/modules/paperwork/paper.dm
code/modules/telesci/bscrystal.dm
html/changelog.html
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-04-25 21:14:58 -05:00
Ravensdale
45d82c2e00
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoron
...
Conflicts:
code/modules/mob/living/say.dm
maps/tgstation2.dmm
2014-04-16 22:13:48 -07:00
Ravensdale
68eda5201b
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron
...
Conflicts:
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
code/modules/paperwork/paper.dm
html/changelog.html
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-04-16 21:44:26 -07:00
Ravensdale
a3e4a43536
Changes most viable, used entries of plasma with phoron.
2014-04-10 05:05:04 -07:00
Ravensdale
e6c3fbf071
Changes all appropriate instances of 'Plasma' to 'Phoron'
2014-04-10 01:19:49 -07:00
Jarcolr
868dea5681
Grammar patch 1
...
This is just the first one of many.
2014-04-08 14:48:31 +03:00
iamgoofball
238451dbc9
die monkey emergency DIE
2014-04-06 12:05:41 -07:00
Graham Lloyd
72e45ebf7b
A first pass at more realistic w_class values
2014-04-03 17:54:06 -04:00
RKF45
aa08abed18
Fix
2014-03-22 19:06:45 +01:00
RKF45
5d6f425dd4
Removal of bees
2014-03-22 18:45:28 +01:00
DJSnapshot
4492648491
server crash fix based off of https://github.com/tgstation/-tg-station/pull/2943/files
2014-02-28 17:38:58 -08:00
Segrain
cec9b87289
Folder recipes.
2014-02-03 04:45:42 +03:00
Mloc
c46d872e6c
Merge remote-tracking branch 'upstream/master' into dev
2014-01-12 19:46:31 +00:00
Loganbacca
909928f3f9
Plasma glass stacking fix
2014-01-11 18:14:51 +13:00
Kyrah Abattoir
7315b75cca
FIXED: inconsistencies with stack item names.
...
CHANGE: stacks are gender = PLURAL by default because it fits.
Conflicts:
code/game/objects/items/stacks/stack.dm
2014-01-08 19:48:43 +00:00
Mloc-Argent
b175c6906b
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
...
Conflicts:
html/changelog.html
2013-12-13 19:13:43 +00:00
Zuhayr
ced5cf2020
Actually fixes #4030 , previous commit fixes #4014
2013-12-05 21:59:12 +10:30
Nanai
160e0f9ee8
Poultice potency, bugfixes
...
Herbal poultice effectiveness now scales with potency of base herb.
2013-11-14 15:21:29 -05:00
Nanai
ae31f9cdcf
Surgery Update
...
Proper repair surgery for internal organs- Scalpel replaced by membranes from advanced kits, robotic hearts have a separate surgery.
2013-11-14 13:08:31 -05:00
Iamgoofball
989c8b69c5
Fixed Copypasta again!
...
Fixed Copypasta again!
Fixed Copypasta again!
Fixed Copypasta again!
Fixed Copypasta again!
Fixed Copypasta again!
2013-11-02 11:36:14 -07:00
Iamgoofball
74b5a003cc
Fixed Copypasta!
...
Fixed Copypasta!
2013-11-02 11:17:17 -07:00
Iamgoofball
a75492d26b
Startoad's plasma windows commit, I'm doing the github stuff for it.
...
3677121b51
2013-11-01 18:53:45 -07:00
Segrain
ace205b323
Code cleanup.
2013-10-18 08:40:45 +03:00
Segrain
0b661bc854
Fixes for stacks.
2013-09-19 08:34:38 +03:00
Mloc-Argent
a084f74c7d
Expansion of every "icon = ''" path.
...
Supposed to help compilation times. Who knows.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-09-01 21:53:36 +01:00
Erthilo
3557e12943
Suits with shoes protect against glass shards.
2013-08-28 12:49:23 +01:00
comma
8735254b87
Moved code from parent class with checks to subclasses.
...
Lots of copypaste code, but better that bloating that one main function even more IMHO.
As for bloat reason - readded advanced medithingies. Work same as lesser ones, but heal some damage directly instead, and have different messages/
2013-08-01 05:53:48 +04:00
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
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
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
1d28bb7cb3
Message tweaks.
2013-06-28 15:55:41 -07:00
Zuhayr
58bf2d218c
Bandages and ointment cannot be used through space suits.
2013-06-27 18:02:10 -07: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
bdb16b1f99
Renamed bruise pack back to gauze.
...
STAY LIKE THAT.
2013-05-22 14:05:53 +04:00
jediluke69
e256f2d095
should nerf nanopaste
2013-04-24 19:42:19 -04:00
NerdyBoy1104
390029007d
Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from.
2013-04-23 22:52:08 +01:00
Spamcat
5e2c921933
Fixed nanopaste messages.
...
(and some my shitcode)
2013-03-18 18:01:51 +04:00
