a8dc3a282b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs
2015-08-18 12:06:53 -07:00
4ddf90d8f7
Merge pull request #159 from Woodratt/Woodrat_work_8.0
...
Woodrat Work 8.0 Boot Knife DLC
2015-08-18 00:35:06 -04:00
7d65038d38
Woodrat Work 8.0 Boot Knife DLC
...
- Industrial Hardsuit RCD removed
- Single Action figure added to the vacant shop.
- Comfort creature added to the psych office.
- Piping underneath the holodeck control doors removed.
- Firelocks along the fore part of the central ring now glasslocks
- Air Alarms added to the cyborg station, upload foyer, messaging server room.
- Light switch, fire alarm radio, and air alarm added to secondary tool storage.
- Coffee shop shutters and door properly labeled.
- Status display added to the IA office.
- Second photo album added to the detective’s office.
- Removed forgotten items on mining z-level. I.E. I screwed up.
- Atmos backwards pumps should be fixed and sorted.
- Distro and waste lines tweaked in atmos.
- Crowbars should now be dispensed from oxy wall lockers.
- Tweaked the variables on the outpost SMES units. New SMES added to the mining engineering outpost.
- Pill cabinets added to the medbay at central.
- Mulebots should have proper access now.
- Overhaul to parts of the mining z-level. Fixed several issues brought up.
- Spoons added to the cafeteria
- One extra ERT suit for each role added to the ERT area.
- New item, combat knife. Should be robustier than the tactical knife. Available for ERT and two for the mercs.
- New item, marine boots. Basically just renamed jackboots at the moment.
- Tactical Knives and combat knives can now be put into swat boots and marine boots. Depending on how well the feature works will be expanded to include other boots.
2015-08-17 20:47:05 -07:00
0e4c2430d1
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2015-08-18 11:59:50 -07:00
a896991657
Even comments need matching spans for Travis to pass.
2015-08-18 11:55:43 -07:00
71214d859e
Merge with master.
2015-08-18 11:31:10 -07:00
29be304c89
Merge pull request #10640 from Karolis2011/map_capture
...
Added map capture tool
2015-08-18 02:51:56 +01:00
b6e7d33f3d
Merge pull request #10715 from GinjaNinja32/irc
...
Adds settable rank to IRC messages, changes it so non-admins can see …
2015-08-17 18:51:53 -07:00
f0c8db3d0f
Adds settable rank to IRC messages, changes it so non-admins can see who on IRC is messaging them, and adds the name of the original sender to reply PMs
2015-08-18 02:16:50 +01:00
b24e691b8c
Merge pull request #10683 from SomeoneElse2/dev
...
Research minor fixes, fix item design path definition, macro usage
2015-08-17 14:23:00 -04:00
e596d3bdd6
Merge pull request #10681 from mwerezak/lighting
...
Ports fix for #10660
2015-08-17 14:17:53 +01:00
5fbe0819b7
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/machinery/Sleeper.dm
2015-08-17 13:05:58 +02:00
e61eb26da9
Merge pull request #10701 from GinjaNinja32/virus
...
fix #10692
2015-08-17 03:11:16 -07:00
b27811ee07
Merge pull request #10700 from GinjaNinja32/locket
...
Remove Sabess's custom item from code, it's been replaced with an entry in the new system.
2015-08-17 03:04:42 -07:00
a2817d9b8c
fix #10692
2015-08-17 10:54:51 +01:00
4cc31d10d9
Remove Sabess's custom item from code, it's been replaced with an entry in the new system.
2015-08-17 10:31:29 +01:00
74b8f6c3be
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
html/changelogs/.all_changelog.yml
2015-08-17 09:44:21 +02:00
55bc41241f
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/setup.dm
2015-08-17 09:37:49 +02:00
15f54c595b
Synths now relies on access permissions as well.
...
Ensures station bound synthetics will not be able to utilize Syndicate/Heist equipment/vessels, as well as the opposite for potential syndicate synths.
2015-08-17 09:12:40 +02:00
3b1c5666d5
Merge branch 'dev' into ofMechfabAndPanic
2015-08-17 09:58:23 +03:00
82a368c0c4
Merge pull request #10690 from NullSnapshot/hotfix
...
Bandaid fix for process scheduler bloating status tab
2015-08-16 23:54:34 -07:00
e99f98e13f
No need for the statpanels.
2015-08-16 23:24:25 -07:00
9d0c072b4a
Adjusts Bump flags to make ALLMOBS mean all mobs again.
2015-08-17 08:06:42 +02:00
438837a9be
Moves ProcessScheduler list to new Processes tab.
2015-08-16 22:46:18 -07:00
4140a1d5ee
Icon update, variables added
...
Bikes are now based off variables, for easy child-making and for admins
to change values.
2015-08-16 23:42:16 -05:00
3f833f2b24
Reimplemented floor lights as a machine built at the autolathe.
2015-08-16 19:26:17 -07:00
5b1b79df6d
Fixes/Adds AS-24 Shotgun
2015-08-16 21:36:36 -04:00
3b712adb5f
Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.
2015-08-16 17:51:19 -07:00
23e9c7d4c9
Merge
2015-08-16 17:10:11 -07:00
14b2114598
AS-24 Shotgun
...
Adds the AS-24 Shotgun.
2015-08-16 19:28:06 -04:00
4d826e68cb
Mob bump fixes.
...
ED-209 is considered massive enough to not bump easily.
update_canmove() no longer unconditionally sets mob density. Fixes #10365 . Fixes #10682 .
2015-08-16 20:55:02 +02:00
d2e2574f07
Merge remote-tracking branch 'upstream/dev' into dev
2015-08-16 20:39:50 +02:00
9b547608f6
[minor] Fix research design item path definition, usage of TECH_* macros
...
code/modules/research/designs.dm:
fixed path definition of `datum/design/circuit/shield`
fixed req_tech variable to now use TECH_* macros
2015-08-17 00:25:37 +06:00
b21bd0c42d
Ports fix for #10660 from vg
...
Courtesy of PJB3005
2015-08-16 14:24:44 -04:00
f0c9f16099
Merge pull request #10677 from PsiOmegaDelta/150816-SynthSay
...
Synth say fixes.
2015-08-16 14:55:04 +01:00
0fe3c6e926
Merge pull request #10678 from PsiOmegaDelta/150816-PrivateSay
...
Makes the private AI channel truly private.
2015-08-16 14:53:38 +01:00
21fd8d825d
Makes the private AI channel truly private.
2015-08-16 15:43:28 +02:00
c72a746f20
Compile fixes.
2015-08-16 06:29:04 -07:00
c1eba26d8a
Holo-decals and fixes.
...
Adds more holodeck decals.
Allows overlays to be glued unto unsimulated turfs.
Ensures holo-stools use an existing icon state.
2015-08-16 06:09:15 -07:00
de6e878411
Fixes floorbots, floor attackby flooring setting, and adjusts a few flooring names.
...
Made set_flooring take a flooring instance, in case calling code already
had a flooring instance it seemed wasteful to have to look up the
flooring all over again.
2015-08-16 06:09:09 -07:00
49575a1e35
Blocked out the holodeck tiles.
2015-08-16 06:07:45 -07:00
b43b396154
Updates instances/tiles for Centcomm.
2015-08-16 06:07:44 -07:00
7c1d9b5614
Mech chargers are now a single machine
...
Can be built and upgraded
Resolves #5215
2015-08-16 06:07:36 -07:00
c8baafed2a
Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and
...
construction/deconstruction. Major map rework/changes.
2015-08-16 06:05:21 -07:00
bb915a2c34
Reverts #10649 , fixes #10621
2015-08-16 06:04:39 -07:00
abf2bea2f0
Fixes #10599
2015-08-16 06:04:38 -07:00
0b01482eb6
Synth say fixes.
...
Adds synth message sanitizing. Fixes #10667 .
Makes sure say() code at least to some degree returns expected values. Fixes #10675 .
2015-08-16 14:00:29 +02:00
0c2d0852ae
Merge pull request #10666 from PsiOmegaDelta/150815-RoundDuration
...
Round Duration display
2015-08-16 03:40:23 -07:00
13076b6f55
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-16 10:32:06 +02:00
7b5b7162d0
Merge pull request #10673 from Baystation12/master
...
Dev-freeze
2015-08-16 10:30:13 +02:00
Zuhayr