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
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
476c8f2fcd
Fix for destroying alien walls with your bare hands.
2013-06-21 19:03:12 -07:00
Zuhayr
afece7e56e
Fixes #3118
2013-06-21 15:07:31 -07:00
Zuhayr
7389d843fc
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-21 18:06:49 -07:00
Zuhayr
fa5202c5ed
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-06-21 18:06:36 -07:00
Zuhayr
a16c8e0595
Fixes #3081
2013-06-21 18:00:25 -07:00
Chinsky
32fd044e52
Merge pull request #3103 from AppleMaster/bleeding-edge-freeze
...
I don't know what I broke
2013-06-20 23:51:30 -07:00
Jim Apples
a23e1c7a92
Added 5 barsigns.
...
Signed-off-by: Jim Apples <cheeckan@gmail.com >
2013-06-19 17:51:41 +01: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
Chinsky
960a22ee43
Changes way viruses are stored in mobs.
...
Now it's an associative list:
uniqueID - virus datum
Updated most instances to match it.
2013-06-19 02:28:53 +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
Segrain
dcf984577a
Adding construction of req_one_access doors.
2013-06-18 02:47:24 +03:00
Segrain
91e1e848f7
Bugfixes for windoor construction.
2013-06-18 02:34:15 +03: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
Whitellama
d23b758006
WIP: Implementing space ninja gamemode
2013-06-15 16:09:23 -07:00
Zuhayr
b1cac56e9a
Merge resolution.
2013-06-15 03:54:22 -07:00
Zuhayr
753129086e
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-06-14 12:01:56 -07:00
Jamini
89766706fe
Alien Monkeys - Farwa, Stok, Aenera
...
Signed-off-by: Jamini <mobiousjami@gmail.com >
2013-06-14 02:22:27 -04:00
Zuhayr
6b73b8ec2f
Adjusted kitchen knives. Added projectile pinning. Various tweaks.
2013-06-13 20:46:09 -07:00
Asanadas
7479fd272c
Added Malsquando's colored suit to the hop's wardrobe locker.
...
Everything should be working correctly.
2013-06-13 09:41:52 -04:00
Chinsky
bb26c5a7cb
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into newstuff
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/security.dm
2013-06-12 23:11:28 +04:00
Vetinari
3c0a424bb3
Medbay Remap post-ERT
...
Medbay Overhaul, mapping post-ERT changes, recommit of previous files
due to computer derp.
2013-06-12 23:27:36 +10:00
Zuhayr
7cd54ac387
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-06-12 11:41:08 -07:00
Zuhayr
0a220db976
Added embedded weapons and adjusted implant removal surgery to work with non-implants in organs.
2013-06-12 00:28:12 -07:00
Zuhayr
d0e15b3608
Harpoon, harpoon sprites, removed pneumatic cannon sprites from human.dmi.
2013-06-11 13:15:33 -07:00
Chinsky
bd3879da2e
Merge pull request #3040 from Baystation12/master
...
hurka durka master update
2013-06-11 12:25:56 -07:00
Chinsky
09d0bb7f8e
Merge pull request #3039 from Furlucis/master
...
Typo fixes
2013-06-11 12:21:16 -07:00
Spamcat
076f4c9d9a
Figured I should finally commit it, since exams are over now~
...
Radios start off by default. Should decrease the amount of tcomm lag.
2013-06-11 23:09:44 +04:00
Furlucis
360bde9f83
Fixed some typos. (feotal, "/red ...")
...
Signed-off-by: Furlucis <Logman115@gmail.com >
2013-06-11 15:01:48 -04:00
jack-fractal
e3fd232741
- removing yellow and black gloves from the randomized tech storage object
...
- adding toolbelts
- rebuilding changes to map
2013-06-11 00:52:32 -04:00
jack-fractal
245713418f
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
maps/tgstation.2.1.0.0.1.dmm
2013-06-11 00:29:10 -04:00
Chinsky
6dc2d9d2dc
Merge pull request #3015 from comma/master
...
Fix
2013-06-10 11:50:50 -07:00
Zuhayr
bc2db268cc
Vox oxygen toxicity, vox breath mask, nitrogen tank for spawning.
2013-06-10 17:16:54 -07:00
jack-fractal
23498c269a
- adding random objects
...
- randomizing main tool storage starting objects
- randomizing secondary tool storage starting objects
2013-06-09 18:12:57 -04:00
Chinsky
eaf6b64277
Compile fix.
2013-06-09 19:53:08 +04:00
