Segrain
4b8d5c4f14
Code cleanup.
2014-02-04 08:16:06 +03:00
Segrain
3ab805f7c9
Moving flasks into Booze-O-Mat.
2014-02-03 04:55:42 +03:00
Segrain
cec9b87289
Folder recipes.
2014-02-03 04:45:42 +03:00
Segrain
55605624eb
Gamemode autovote.
2014-02-03 04:43:38 +03:00
Segrain
b7059519c2
Merge remote-tracking branch 'upstream/master' into dev
2014-02-03 04:36:03 +03:00
RavingManiac
30915b5ba4
Escape shuttle modified after feedback.
...
Wall emergency lockers now contain two breath masks and two emergency oxygen tanks.
Emergency ration crates contain two boxes of donk-pockets. The escape shuttle has two crates at the back.
2014-02-02 16:04:11 +08:00
Segrain
88e7dbb67f
Fix for mods counting.
2014-02-02 02:33:53 +03:00
RKF45
8fbcda2a0b
Reintroducing the dough-based cooking system.
2014-02-01 02:17:38 +01:00
DJSnapshot
810de4ddaa
Merge pull request #4337 from Baystation12/dev-freeze
...
0.1.8 Staging [Do not merge]
2014-01-31 12:40:15 -08:00
Segrain
4e17dc0b93
Sanity checks.
2014-01-31 16:21:05 +03:00
Segrain
4c87838e64
Double call removal.
2014-01-31 16:19:22 +03:00
Segrain
9fdd34b1ba
Removal of double reporting.
2014-01-31 00:28:25 +03:00
Segrain
9a70dd3d13
Objectives fix.
2014-01-31 00:25:44 +03:00
Segrain
75c88634f7
Definition usage.
2014-01-31 00:22:24 +03:00
Ccomp5950
f136fa1db2
Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev
...
Conflicts:
icons/mob/mask.dmi
2014-01-30 12:56:23 -06:00
Ccomp5950
7962bd3277
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/supermatter/supermatter.dm
maps/tgstation2.dmm
2014-01-30 12:44:33 -06:00
Zuhayr
09ac26818d
Merge pull request #4358 from SueTheCake/armors
...
Tactical Armor Storage + Tac Armor REDUX
2014-01-30 10:33:46 -08:00
Ccomp5950
975433f898
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
icons/mob/back.dmi
icons/mob/mask.dmi
2014-01-30 12:14:44 -06:00
Zuhayr
f08e6c804d
Rogue comma, kill it.
2014-01-30 23:33:57 +10:30
Zuhayr
8850a43dcb
Fixes #3847
2014-01-30 23:21:00 +10:30
Zuhayr
851576b444
Fixes #3907
2014-01-30 22:46:48 +10:30
Zuhayr
97442f4727
Adding Kilakk's fix for #4145
2014-01-30 22:31:22 +10:30
Zuhayr
65252e174b
Fixes #4089
2014-01-30 22:18:01 +10:30
Zuhayr
651599a669
Fixes #4306
2014-01-30 21:35:02 +10:30
Zuhayr
7a36d1c9bc
Fixes #4346
2014-01-30 21:30:58 +10:30
suethecake
6f69e7f821
Stuff.
2014-01-29 18:15:35 -06:00
Zuhayr
c0b91504b4
Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR.
2014-01-28 15:59:50 +10:30
Zuhayr
9d7b42f6b6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-27 20:55:42 +10:30
Zuhayr
5d02779d16
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-27 20:55:15 +10:30
Chinsky
ada2ba9a2f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into color
...
Conflicts:
code/modules/power/cable.dm
icons/obj/power_cond_red.dmi
2014-01-27 02:27:27 +04:00
Zuhayr
84b3512261
Merge pull request #4345 from RKF45/misc
...
Fixes for my earliest commits
2014-01-26 09:16:07 -08:00
Zuhayr
68258a3b1b
Merge pull request #4348 from Ccomp5950/rp_revconvert_fix
...
RP-revconvert bugfix
2014-01-26 09:15:01 -08:00
Zuhayr
1fce280da8
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-26 20:07:02 +10:30
Ccomp5950
50c077c09f
Cryopod icon_state fix.
...
Missing _ in the icon states.
2014-01-26 01:39:07 -06:00
Ccomp5950
ddca656672
RP-revconvert bugfix
...
Now only humans that are logged in, alive, and not already a revolutionary (no special_role) show up in the list.
Instead of EVERY mob type (simple_animals, borgs, etc.)
2014-01-25 23:36:11 -06:00
Ccomp5950
dfec09ebb2
Merge pull request #4342 from Zuhayr/ihategit
...
Multiz changes.
2014-01-25 20:24:49 -08:00
RKF45
4ca429fdf3
Actually allowing tiny objects on ears
2014-01-25 13:06:22 +01:00
Kilakk
44962760b8
Removed pointless output
...
* There's something here about var/revsafe being used for heads/implanted people
... or something like that
2014-01-24 15:04:41 -05:00
Zuhayr
5709dc2629
Fixes so ladders actually connect and function now.
2014-01-25 04:16:18 +10:30
Zuhayr
e870d614c2
Mass correction of controler to controller.
2014-01-25 03:15:13 +10:30
Kilakk
1a7616fb35
Fixes #4322
...
* There's probably a much more "modular" way of doing this, but, eh
2014-01-23 20:53:05 -05:00
Mark Aherne (Faerdan)
ae4d35e354
NanoUI Gas Cooling/Heating System
...
* Created Nano UIs for the Gas Cooling System and Gas Heating System
* Standardized the reference structure for procs (they now use use full paths, instead of relative)
* Standardized the names of each machine ("gas cooling system" and "had heating system") for both the object and the UI title
2014-01-24 00:38:26 +00:00
Ccomp5950
283df26fa7
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
2014-01-23 00:19:01 -06:00
Ccomp5950
c028db481e
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/monkey/diona.dm
code/modules/reagents/Chemistry-Machinery.dm
2014-01-23 00:05:53 -06:00
Chinsky
3b26dab954
Merge pull request #4309 from LBraindead/dev
...
AMEN
2014-01-19 21:25:19 -08:00
Chinsky
5a8eb3c455
Merge pull request #4318 from Loganbacca/engineroom
...
Engine Room Redesign
2014-01-19 21:22:45 -08:00
Zuhayr
0ad12c7e72
Merge pull request #4313 from RKF45/small
...
Small
2014-01-19 18:58:33 -08:00
Loganbacca
24c6063a07
Updated Supermatter user manual sprite
2014-01-20 01:57:58 +13:00
Loganbacca
0f4068724b
Pod door tweaks
...
- Added directional pod door sprites
- Made pod doors change draw layer when they open and close
- Pod doors draw behind the glass layer when open
- Pod doors draw in front of the glass layer when closed
2014-01-20 01:57:57 +13:00
Loganbacca
0ede7ed9cb
Engineering area tweaks
...
- Added a few Engineering areas, and moved one from the Rust files
- Made the "Engineering Storage" area overlay sprite transparent
2014-01-20 01:57:57 +13:00
