Commit Graph

8627 Commits

Author SHA1 Message Date
Zuhayr
1ea83f4365 Removed the DNA2 debug message in the dream daemon console. 2014-12-28 18:32:38 +10:30
Zuhayr
fabee2fdf8 Stopped glass shards from proning mobs with NO_PAIN. 2014-12-28 17:32:55 +10:30
Zuhayr
a7f47e32d7 Merge pull request #7534 from mwerezak/doors
Doors and stacks
2014-12-28 13:14:23 +10:30
Zuhayr
931682f926 Fixes #7327 2014-12-27 10:01:17 +10:30
mwerezak
07debf9405 Adjusts door repair to use a welding tool 2014-12-25 15:31:15 -05:00
mwerezak
f297f7cd0a Stack reorganization, use() now dels after yield
stack/use() now only deletes an empty stack after the current context
yields, removing the need for some awkward patterns when dealing with
stacks. Also adds procs for transferring and splitting stacks.
2014-12-25 15:09:09 -05:00
mwerezak
64e26b2dbd Fixes robot stacks transferability
Cleans up transferring between stacks and makes robot stacks
transferable with regular ones.
2014-12-25 15:06:31 -05:00
Zuhayr
8978747e53 Moved several globals into the config controller, updated eample config appropriately. 2014-12-25 21:10:30 +10:30
Zuhayr
3997129390 Tidies up setup.dm, moves a bunch of vars to global.dm, changes the case of a couple. 2014-12-25 20:26:22 +10:30
Zuhayr
f4ada7b869 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-12-25 20:05:01 +10:30
Atlantiscze
4ba6e20b04 Fixes shutters texture when damaged
- Damaged shutters no longer transform into blast doors.
- Fixes #7443
2014-12-25 01:37:21 +01:00
SkyMarshal
fee93bba38 Fix bloody extinguisher bug. 2014-12-24 16:24:16 -07:00
PsiOmegaDelta
3427787359 Merge pull request #7524 from Zuhayr/mutantrace
Species and organ fixes.
2014-12-25 10:56:17 +13:00
Zuhayr
0263bc9c84 merge 2014-12-24 22:50:13 +10:30
Zuhayr
c49cb0c645 Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze 2014-12-24 22:43:10 +10:30
Zuhayr
aeb93d8c4a Fixes #7108 2014-12-24 22:43:00 +10:30
Zuhayr
c6245681d6 Fixes #5910 2014-12-24 22:23:26 +10:30
PsiOmegaDelta
aa3aa472fe Merge pull request #7516 from mwerezak/pipecleaner
Replaces connect type system
2014-12-24 19:50:36 +13:00
PsiOmegaDelta
f580eb230e Merge pull request #7521 from mwerezak/master
Fixes being able to put lit welders in backpacks
2014-12-24 19:49:53 +13:00
mwerezak
d36f465647 Fixes being able to put lit welders in backpacks 2014-12-24 00:55:56 -05:00
Zuhayr
4b030f30cd Refactors and fixes a fair bit of organ transplanting/reattachment/gibbing code. Also fixes an issue with species HUDs. 2014-12-24 16:06:00 +10:30
PsiOmegaDelta
d1758a7162 Merge pull request #7510 from Zuhayr/mutantrace
Gibber fixes/refactor, mutantrace refactor, couple of small fixes.
2014-12-24 17:29:39 +13:00
Zuhayr
01f2d28187 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into mutantrace 2014-12-24 12:47:56 +10:30
Zuhayr
a82ec718f3 Fixes #7508 2014-12-24 12:43:36 +10:30
Zuhayr
591fc164de Updating rack paths to match previous commit. 2014-12-24 12:26:43 +10:30
Zuhayr
2ed0e433aa Table/rack refactor. Fixes #7509 2014-12-24 12:14:48 +10:30
mwerezak
d4a193808b Replaces awful connect type system with bitflags 2014-12-23 18:59:54 -05:00
Zuhayr
cc00fa3d52 Fixes and tweaks to the previous. 2014-12-23 22:03:02 +10:30
Zuhayr
bbfc6db0a3 Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right) 2014-12-23 17:38:05 +10:30
Zuhayr
b9f9337584 Fixes atmos alert consoles for #5460 2014-12-23 14:00:02 +10:30
Zuhayr
7c2407c21c Fixes #5220 2014-12-23 13:23:35 +10:30
ccomp5950
3ba1b18b8f Most PDA's now are set to silent on news updates.
resolves #7454

Heads and Librarian(reporter) are not set to silent.  The librarian can shush herself.
old bitty.
2014-12-22 21:44:26 -05:00
Zuhayr
056d2c1584 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-12-23 12:56:42 +10:30
PsiOmegaDelta
5b03184e9c Merge pull request #7491 from Mloc/bs12-sleepyedges
atmos changes; sleepy edges and hardy rwalls
2014-12-22 20:04:08 +01:00
Mloc-Argent
8800c33e50 fixes #7487
also fixes lag when building APCs in space.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-22 15:41:07 +00:00
Mloc
f4e171c1b1 Merge pull request #7484 from Zuhayr/languages
Language scrambling/species selection window.
2014-12-22 13:21:24 +00:00
Zuhayr
d82e7e42de Merge pull request #7477 from atlantiscze/substation-remap
Substation remap
2014-12-22 23:47:36 +10:30
Zuhayr
3de0562dbe Merge resolution. 2014-12-22 23:28:27 +10:30
Zuhayr
32d799e53e Line ending conflict resolution. 2014-12-22 23:27:06 +10:30
Mloc-Argent
7c7d35eded buff rwall health, change wall fire damage scaling.
Now uses a fancy log instead of whatever that thing was.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-21 20:36:59 +00:00
Mloc-Argent
cf15517f8a fix up airless turfs to be actually airless
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-21 20:36:11 +00:00
Mloc
5895615f72 Merge pull request #7377 from Amunak/ref
Research and circuit boards refactoring and improvements. Explosive can no longer be planted on webbing. Also some other stuff.
2014-12-18 22:29:35 +00:00
Mloc
66cb91d281 Merge pull request #7280 from Neerti/12_7_14_holopad_and_emotes
Adds see_emote(), other cool things.
2014-12-18 22:10:54 +00:00
Amunak
c53d14d80c Weapon type design datums will now get proper description.
Also fixes two names I forgot to fix before.
2014-12-18 05:28:41 +01:00
Amunak
16c548b03f Fixes explosives-on-webbing-prevention not working 2014-12-18 05:27:37 +01:00
Amunak
d28cb57f79 Merges upstream/dev to ref, resolves merge conflicts 2014-12-18 03:44:28 +01:00
Amunak
d20ccdb6b4 More name updates and refactoring for research
Also fixes compile errors
2014-12-18 03:26:55 +01:00
Amunak
4882074739 Code formatting, EOL at EOF fixes, refactoring 2014-12-18 03:11:49 +01:00
Amunak
edffbc680d Fixed capitalization of most game items 2014-12-18 03:10:36 +01:00
Amunak
1fcf11cdb5 You can no longer plant explosives on webbing. 2014-12-18 01:17:50 +01:00