Yoshax
531bbcfb7c
Fixes HoS' office door
2015-04-27 22:40:02 +01:00
Daranz
8b792b6361
Merge branch 'dev' into paper-functionality
2015-04-27 12:37:31 -04:00
Yoshax
aa115f5bb2
Fixes antag surgery kit
2015-04-27 16:41:47 +01:00
PsiOmega
a999202cfc
Changelog entry.
2015-04-27 11:05:05 +02:00
PsiOmega
a78c559f6c
Merge remote-tracking branch 'upstream/master' into dev
2015-04-27 08:08:39 +02:00
RavingManiac
89a72fb326
Candle burn time increased to ~30 minutes
...
Some fluff added to candle description explaining how they burn in space
2015-04-27 12:10:54 +10:00
Zuhayr
1c627a94b9
Merge pull request #8991 from Kelenius/ofBotsAndMobs
...
Updates bots to be mobs. Several changes.
2015-04-27 11:29:32 +09:30
PsiOmega
c83559a417
Merge remote-tracking branch 'upstream/dev' into PsycEval
...
Conflicts:
html/changelogs/PsiOmegaDelta.yml
2015-04-26 23:24:28 +02:00
PsiOmega
e8410c620c
Changelog.
2015-04-26 22:07:52 +02:00
PsiOmega
952cdda4e6
Merge remote-tracking branch 'upstream/dev' into PortableNanoUI
...
Conflicts:
baystation12.dme
2015-04-26 19:40:05 +02:00
PsiOmega
19a981e961
Airlocks can now crush more things.
...
Airlocks can now crush mobs, canisters, closets, and mechas.
Fixes #8983 .
2015-04-26 19:29:13 +02:00
Chinsky
5f30d0fa9a
Merge pull request #8982 from PsiOmegaDelta/Bullets
...
Adds practice rounds.
2015-04-26 20:06:37 +03:00
Chinsky
7359562e16
Merge pull request #8905 from PsiOmegaDelta/BorgModules
...
Silicon Subsystem update.
2015-04-26 20:06:21 +03:00
Chinsky
946373f8a0
Merge pull request #8975 from PsiOmegaDelta/Thunderdome
...
Custom ambiance music for holodeck programs.
2015-04-26 20:05:58 +03:00
PsiOmega
85473bf356
Changelog.
2015-04-26 17:52:23 +02:00
Kelenius
b7a628d53d
Merge branch 'dev' into ofBotsAndMobs
...
Conflicts:
code/game/machinery/bots/cleanbot.dm
code/game/machinery/bots/ed209bot.dm
code/game/machinery/bots/farmbot.dm
code/game/machinery/bots/floorbot.dm
code/game/machinery/bots/medbot.dm
code/game/machinery/bots/secbot.dm
code/game/objects/items/robot/robot_parts.dm
2015-04-26 17:18:20 +03:00
PsiOmega
fe09ed1a22
Merge remote-tracking branch 'upstream/dev' into BorgModules
...
Conflicts:
code/game/objects/items/robot/robot_upgrades.dm
code/modules/mob/living/silicon/ai/subsystems.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/silicon/robot/robot_upgrades.dm
2015-04-26 15:52:18 +02:00
PsiOmega
74733cb0e9
Changelog.
2015-04-26 15:44:36 +02:00
PsiOmega
30b4cf412d
Mental Health Office changes.
...
Mental health office door now requires psychiatrist access.
Changes the door bolt control into a basic door opener/closer.
2015-04-26 12:38:09 +02:00
Chinsky
1c29c800ad
Merge pull request #8933 from RavingManiac/dev-2
...
Toxins Lab Upgrade
2015-04-26 01:04:57 +03:00
Chinsky
3e3b772a13
Merge pull request #8926 from Yoshax/loadoutpoints
...
Adjusts custom loadout item prices.
2015-04-26 00:48:39 +03:00
PsiOmega
4a35631af1
Attempts to save Yosh's code.
2015-04-25 16:39:09 +02:00
PsiOmega
d7bbc6f1c3
Makes it possible to define custom ambiance music for holodeck programs.
...
Cleans up holodeck code. Revives an old SS13 track, THUNDERDOME!
2015-04-25 10:53:14 +02:00
Zuhayr
173329f675
Merge pull request #8968 from Jarcolr/signed
...
Adds 9 new bar signs.
2015-04-25 03:09:35 +09:30
Jarcolr
28c037b6ce
Adds 9 new bar signs.
2015-04-24 17:35:07 +03:00
PsiOmega
61085c9976
Updates the changelog.
2015-04-24 09:25:38 +02:00
Chinsky
60e7aacf79
Merge pull request #8951 from Dennok/patch-15
...
floorlayer
2015-04-24 10:04:29 +03:00
Chinsky
2159045b81
Merge pull request #8879 from Dennok/patch-6
...
Fix speed and add rotate()
2015-04-24 10:01:13 +03:00
Daranz
1bd25c54e3
Add random access inserting into paper bundles
...
You can now insert papers into paper bundles by clicking on the next page or
previous page link with a sheet of paper in hand.
The bundle window also now correctly updates when the bundle is in a folder.
2015-04-23 21:49:56 -04:00
RavingManiac
baa3e890e2
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-2
2015-04-23 22:17:23 +10:00
PsiOmega
b693d65a17
Updates the changelog.
2015-04-23 13:55:40 +02:00
PsiOmega
eee67109d1
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/say.dm
2015-04-23 13:15:43 +02:00
PsiOmega
2aa9a70496
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-04-23 12:59:47 +02:00
Zuhayr
f06326556a
Merge pull request #8838 from Dennok/patch-5
...
Pipelayer
2015-04-23 20:03:20 +09:30
RavingManiac
2f09a26cef
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-2
...
Readded burn chamber fuel measuring assembly to toxins lab
2015-04-23 20:30:40 +10:00
Chinsky
788f7fd05a
Merge pull request #8940 from PsiOmegaDelta/DisposalMassDrive
...
Disposals Refresh
2015-04-23 09:20:55 +03:00
Chinsky
df21e9fc2e
Merge pull request #8921 from PsiOmegaDelta/DirtyEngineers
...
Shower curtains no longer lose their default color upon being washed.
2015-04-23 07:34:44 +03:00
Chinsky
6cc8be6d90
Merge pull request #8936 from Dennok/patch-14
...
Automatic CableLayer
2015-04-23 07:34:00 +03:00
Dennok
239194cf20
Create Dennok-PR-8951.yml
2015-04-22 23:23:50 +03:00
Dennok
06a6603870
Update Dennok-PR-8936.yml
2015-04-22 19:47:31 +03:00
PsiOmega
6966e429d9
Merge remote-tracking branch 'upstream/dev' into DisposalMassDrive
2015-04-22 17:44:08 +02:00
Yoshax
a2cf2a4d1a
Adjusts custom item loadout costs to be more balanced and standardises costs, standard cosmetics are 1 point, items with uses/armor/storage are 2 points.
2015-04-22 16:19:59 +01:00
PsiOmega
4ce1ec1f3d
Pipelayer feedback.
...
Adds span use. Updates and adds visible messages as necessary.
Corrects more instances where on was used instead of a_dis.
2015-04-22 16:49:54 +02:00
Yoshax
e68f9cec70
Adjusts fruits and stuff to have more juice and stuff.
2015-04-22 15:05:38 +01:00
Dennok
2083c5f337
Create Dennok-PR-8879.yml
2015-04-22 14:19:11 +03:00
PsiOmega
115d28e6dc
Disposals Refresh
...
Began with removing a couple of random power cables under grills on the asteroid.
Then added a blast door to go with the disposal mass driver, to prevent trash from floating out into space before ejection, while giving the place a bit of character.
2015-04-22 13:15:05 +02:00
Dennok
d27817903b
Create Dennok-PR-8838.yml
2015-04-22 14:11:23 +03:00
Dennok
7b53e18e11
Add changelog
2015-04-22 14:05:52 +03:00
PsiOmega
4cc524265b
Change of random virus targets.
...
The random virus event will now only infect mobs on station and which currently have a player that has been active in the last 5 minutes.
Placeholder until a more indepth discussion about what to do about the random event is concluded.
2015-04-22 12:27:28 +02:00
PsiOmegaDelta
7a27aece0d
Merge pull request #8941 from Baystation12/master
...
Dev
2015-04-22 09:32:56 +02:00
