Zuhayr
e2f69bd6cd
Moves language.dm into its own folder.
2015-03-01 02:01:37 +10:30
Zuhayr
fa7eb6ebf9
Adding some checks to job spawn for more precise intro text.
2015-03-01 01:07:45 +10:30
Zuhayr
425904dbb3
Tidies up job.dm's spacing.
2015-03-01 00:49:47 +10:30
Zuhayr
1f448a40d1
Giving the assistant macro a more descriptive name.
2015-02-28 20:28:51 +10:30
Zuhayr
64b33c43db
Refactors some job variables from the Economy file (what the fuck) and swaps created types for lists in bot access assignment.
2015-02-28 20:20:19 +10:30
Zuhayr
92fc2e13e9
Merge pull request #8301 from PsiOmegaDelta/Remapping
...
Map Changes
2015-02-27 22:44:45 +10:30
PsiOmegaDelta
69fd0b0c29
Merge pull request #8309 from PsiOmegaDelta/dev
...
Dev
2015-02-27 10:24:41 +01:00
PsiOmega
2c032cacaf
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-02-27 09:52:51 +01:00
PsiOmegaDelta
a2dacdc1ab
Merge pull request #8308 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2015-02-27 09:26:11 +01:00
PsiOmega
7e498e1cf7
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/hydroponics/seed_datums.dm
code/modules/hydroponics/trays/tray_apiary.dm
code/modules/power/apc.dm
code/setup.dm
2015-02-27 09:06:48 +01:00
PsiOmega
558701a1bb
Map Changes
...
Corrects multiple camera network issues on the asteroid outpost.
Updates camera consoles on the station accordingly.
Flips a flag for a PSU rack to avoid annoying server start messages.
Adds more signs, markers, etc. for a more living map.
2015-02-27 08:56:00 +01:00
PsiOmegaDelta
f45efd720d
Merge pull request #8291 from PsiOmegaDelta/dev
...
Dev
2015-02-26 08:29:27 +01:00
PsiOmega
e7653e1ed5
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-02-26 08:22:25 +01:00
Zuhayr
f14922f1f8
Merge pull request #8288 from mwerezak/topicfix
...
Topic Fixes
2015-02-26 16:28:56 +10:30
Zuhayr
a9d23df3ff
Merge pull request #8279 from PsiOmegaDelta/CameraNet
...
Fixes camera network changes not always being reflected in camera consoles.
2015-02-26 16:28:49 +10:30
Zuhayr
bceb01c233
Merge pull request #8290 from mwerezak/gun-rewrite
...
Fixes captain's laser gun
2015-02-26 16:28:43 +10:30
Zuhayr
234273605e
Merge pull request #8271 from PsiOmegaDelta/AlertMe
...
Fixes #8266 .
2015-02-26 16:28:26 +10:30
Zuhayr
586ab164f8
Merge pull request #8242 from PsiOmegaDelta/StarDimmer
...
Makes starlight strength configurable.
2015-02-26 16:28:09 +10:30
Zuhayr
55fdf42269
Merge pull request #8216 from PsiOmegaDelta/JukeboxFix
...
Jukebox fix.
2015-02-26 16:27:28 +10:30
Zuhayr
0e80242e92
Merge pull request #8212 from PsiOmegaDelta/CleanTopic
...
Minor NanoUI/Topic cleanup
2015-02-26 16:27:08 +10:30
Zuhayr
d98eb1c823
Merge pull request #8289 from MrSnapwalk/actionfigurefix
...
Fixes action figures not randomizing properly.
2015-02-26 16:26:37 +10:30
mwerezak
ec59f8ab07
Fixes captain's laser gun
...
Also updates retro laser gun path, as it isn't really conceptually
related to the carbine anymore, and should avoid inheriting things like
fire rate.
2015-02-25 23:35:20 -05:00
MrSnapwalk
f4f54dfed1
Fixes action figures not randomizing properly.
2015-02-25 21:52:36 -06:00
mwerezak
6d15809768
Corrects return values for the Topic procs of several computers and some other machines as well.
2015-02-25 21:32:35 -05:00
Snapshot
a910986ed4
Merge pull request #8272 from PsiOmegaDelta/NanoLimit
...
Fixes #8258 .
2015-02-25 16:13:22 -08:00
Snapshot
f2432bb104
Merge pull request #8273 from PsiOmegaDelta/HoloMap
...
Map fixes.
2015-02-25 15:34:08 -08:00
PsiOmega
4dca85b17c
Fixes camera network changes not always being reflected in camera consoles.
...
Cameras with altered networks would not necessarily show up on camera consoles, primarily affecting cameras joining/leaving alarm zones.
2015-02-25 19:50:07 +01:00
PsiOmega
c61a60c064
Map fixes.
...
Fixes one of the holodeck issues mentioned in #8267 . Was unable to reproduce the failure to load the basketball simulation.
Fixes a problem in the vault where the a crate of gold had been replaced with a vault door instead.
2015-02-25 19:22:45 +01:00
PsiOmega
dfd83f787a
Fixes #8258 .
...
Main correction is the removal of Topic() in code/game/machinery/computer/computer.dm.
Issue introduced in #7617 where I stated multiple times this Topic()-return value was incorrect.
Ensures that computers return the correct value after the ..() check.
2015-02-25 09:47:50 +01:00
PsiOmega
768faa4bf0
Fixes #8266 .
...
Ensures drones get access to the alarm monitor subsystem.
Restores the Show Alerts link in alarm notices.
2015-02-25 09:07:04 +01:00
PsiOmegaDelta
51b722485a
Merge pull request #8259 from mwerezak/gun-rewrite
...
Gun fixes
2015-02-25 07:21:29 +01:00
mwerezak
b067b491a4
Returns the laser carbine capacity to 10
2015-02-25 00:15:08 -05:00
mwerezak
9782140d32
Resolves #8236
...
Lasers deal more damage to grilles, and clicking directly on the grille
makes it more likely for the grille to absorb the projectile.
2015-02-25 00:14:42 -05:00
mwerezak
ae6466ac45
Examining the Z8 now shows what is loaded in the grenade launcher.
2015-02-25 00:14:02 -05:00
Zuhayr
b806b2d29b
Merge pull request #8209 from mwerezak/ninja
...
Ninja rebalancing
2015-02-25 14:15:32 +10:30
mwerezak
3e71802a52
Replaces colt signal pistol with a Mk58 version.
...
Makes more sense for the HoP, and ensures the colt remains more of a
detective signature item.
2015-02-24 21:23:19 -05:00
mwerezak
944be58804
Adjusts sniper rifle damage
...
Lowers wall pierce chance back to original value to compensate, and
increase the cost of ammo by 1 TC.
2015-02-24 20:45:40 -05:00
mwerezak
401709cd23
Merge remote-tracking branch 'upstream/dev-freeze' into gun-rewrite
2015-02-24 20:15:18 -05:00
Snapshot
600f55bdca
Merge pull request #8252 from Raptor1628/dev-freeze
...
Assorted Fixes
2015-02-24 17:08:33 -08:00
mwerezak
5124055663
Fixes #8243
...
Didn't want to have to generate even more lists so this is what you get.
2015-02-24 19:42:24 -05:00
mwerezak
404c8886da
Fixes #8230
2015-02-24 19:37:49 -05:00
Raptor1628
d4870b80ee
Assorted Fixes
...
Rebalances the random armory so there are always energy weapons,
projectile weapons, and ion weapons. Ammo no longer random. Fixes some
oversights with the EMT area and improves flow. Sec Guns fit in belts.
Fixes typos and a missing price in the vending machine.
2015-02-24 14:40:02 -05:00
Chinsky
00848f1a48
Merge pull request #8251 from GinjaNinja32/shuttlefix
...
Fixes shuttles. All of them.
2015-02-24 22:16:48 +03:00
Zuhayr
24dacf0169
Merge pull request #8227 from PsiOmegaDelta/Syndicate
...
Fixes #8223 .
2015-02-25 05:46:20 +10:30
Zuhayr
a1afc3a48a
Merge pull request #8235 from PsiOmegaDelta/HoldIt
...
Fixes #8234
2015-02-25 05:45:54 +10:30
GinjaNinja32
86243b97fd
Fixes shuttles. Yes, all of them.
2015-02-24 19:15:16 +00:00
Chinsky
0dca584103
Merge pull request #8220 from PsiOmegaDelta/MalfTurrets
...
Fixes Malfuction Turret Upgrade
2015-02-24 20:25:31 +03:00
PsiOmegaDelta
35dffc934d
Merge pull request #8233 from Neerti/2-24-2015_fixes_desc_bug
...
Fixes some examine bugs.
2015-02-24 16:16:23 +01:00
PsiOmega
d0aa773020
Makes starlight strength configurable.
2015-02-24 16:12:07 +01:00
PsiOmega
b3b7ed06cd
Fixes #8234
...
Updates a few missed containers to use proper paths.
2015-02-24 14:06:23 +01:00
