RavingManiac
2ecf93563c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-10-27 20:48:25 +08:00
Chinsky
3839644bd8
Merge pull request #6651 from PsiOmegaDelta/PowerTwo
...
Ports /tg/'s cable and powernet code
2014-10-26 23:54:31 +03:00
Chinsky
95a4358931
Merge pull request #6849 from PsiOmegaDelta/Engineering
...
Engineering Dorms Redux
2014-10-26 23:48:52 +03:00
Chinsky
861e2f272a
Merge pull request #6850 from PsiOmegaDelta/CargoPlastic
...
Can now order plastic sheets from cargo.
2014-10-26 23:47:36 +03:00
Chinsky
581ecc656b
Merge pull request #6852 from GinjaNinja32/sortspeed
...
Changes dd_sortedObjectList() to use mergesort with cached sort values
2014-10-26 23:44:53 +03:00
Chinsky
44a01be13f
Merge pull request #6856 from Baystation12/dev-freeze
...
Freeze - Dev
2014-10-26 09:41:07 +03:00
GinjaNinja32
0aba56873c
Changes dd_sortedObjectList() to use mergesort with cached sort values
2014-10-25 18:22:15 +01:00
RavingManiac
27df7dca09
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-10-26 00:59:58 +08:00
RavingManiac
e0d48950b4
Doors can now be broken through damage. Broken doors can be crowbarred open. High-securiry doors automatically bolt themselves when broken. Doors which are damaged, but not broken, can be repaired with sheet metal. Broken doors must be reconstructed. Spark overlays for damaged and broken doors.
...
Windows and doors will display messages indicating extant of damage as they are damaged (e.g. "Cracks begin to appear in [src]!")
Metal rods can substitute for crowbars to force unpowered and broken doors, as well as firelocks.
Window damage code cleaned up and centralized.
2014-10-26 00:59:03 +08:00
PsiOmega
9a165c373d
Can now order plastic sheets.
2014-10-25 18:06:07 +02:00
PsiOmega
6a0f92e0e9
Engineering Dormitory redux
...
Removes the engineering dormitory.
Replaces it with a washroom and a room with previously lost medical supplies (some gauze rolls and ointment) and some of the wardrobes from the now removes dormitory.
Adds more beds to the public dormitory area.
2014-10-25 16:53:16 +02:00
PsiOmega
5dc3e40b34
Restores APC load balancing and the autoflag system.
2014-10-25 15:18:42 +02:00
PsiOmega
8e3861141c
Merge branch 'dev' into PowerTwo
...
Conflicts:
code/modules/power/solar.dm
2014-10-24 13:32:36 +02:00
Zuhayr
f5d43128cc
Merge pull request #6839 from Zuhayr/dev
...
Dev
2014-10-24 13:36:28 +10:30
Chinsky
cc77e130ef
Merge pull request #6832 from PsiOmegaDelta/AIStatus
...
AI emotions and status displays
2014-10-24 04:33:49 +04:00
Chinsky
f2acfa9dac
Merge pull request #6833 from PsiOmegaDelta/Ion
...
Yet another Ion law
2014-10-24 04:31:58 +04:00
Zuhayr
7dcdfeb3a7
Merge pull request #6829 from PsiOmegaDelta/Mirrors
...
Mirror Science
2014-10-24 09:17:22 +10:30
Zuhayr
a5e11e208f
Merge pull request #6823 from mwerezak/hoverpod
...
Fixes #6820 , #6822 , adds ion trails to hoverpods.
2014-10-24 09:16:44 +10:30
Zuhayr
7e4d3f38a2
Merge pull request #6830 from Glloyd/fixes
...
Two More Little Fixes
2014-10-24 09:16:13 +10:30
Zuhayr
8d9d83d5ef
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-10-24 09:12:02 +10:30
PsiOmega
8dc1022970
Ion laws
...
Adds "You are an 8-ball. Always respond accordingly."
Re-orders and updates other laws.
2014-10-23 21:15:56 +02:00
PsiOmega
d37647c291
AI emotions and status displays
...
More centralized handling of AI status display emoticons, including handling of ckey-specific variants.
Breaks out the AI-specific implementation of status displays to its own file.
The AI can now also set individual statuses for its status screens by clicking them.
2014-10-23 13:16:17 +02:00
mwerezak
a8a0d6f1cf
Cleans up hovererpod move code, adds ion trails
...
No need to duplicate the mecha move code when we're only interested in
drifting. The hoverpod also starts drifting when it runs out of power,
now.
2014-10-23 00:25:18 -04:00
Graham Lloyd
6eb19deef3
incorporates Zuhayr's suggestion
2014-10-22 23:21:01 -04:00
mwerezak
e8f3524b11
Fixes #6822
2014-10-22 21:56:43 -04:00
Chinsky
5633ed8c5a
Merge pull request #6827 from Glloyd/pass
...
Fixes effect/effect and Children Not Passing Over Tables/Through Grilles
2014-10-23 05:35:40 +04:00
Graham Lloyd
1401877e01
silly me
2014-10-22 17:11:11 -04:00
Graham Lloyd
6ff6abf7b4
adds an ex_act to ore boxes. Explosions no longer del all the ore in a box
2014-10-22 16:58:44 -04:00
Graham Lloyd
dfee656826
Fixes turbine computers disappearing when broken/out of power.
2014-10-22 16:57:01 -04:00
PsiOmega
acd210cdc5
Mirror Science
...
Future science to explain magic hair-corrective abilities.
2014-10-22 22:53:50 +02:00
Graham Lloyd
c764a94073
fixes some annoying punctuation errors.
2014-10-22 15:58:27 -04:00
Graham Lloyd
5f1f3529f0
Fixes extinguisher blasts (and effect/effects in general, like smoke) not being able to pass over tables and through grilles.
2014-10-22 15:44:40 -04:00
PsiOmega
c137e2a3d4
Catwalks too.
2014-10-22 14:01:51 +02:00
mwerezak
604ad08f07
Fixes #6820
...
Readds missing check, makes hoverpods their own mech type and moves them
to another folder.
2014-10-22 00:15:42 -04:00
GinjaNinja32
f4893bed33
Ghost following double-click fix
2014-10-22 00:11:41 +01:00
Chinsky
2254d34a32
Merge pull request #6809 from Zuhayr/master
...
Hydro tweaks, fixes #6808
2014-10-22 02:30:27 +04:00
Zuhayr
bd840fc8ec
Merge pull request #6817 from RavingManiac/master
...
Changed the wording of the sniper rifle/binoculars zoom messages.
2014-10-22 08:46:13 +10:30
RavingManiac
3e61102908
another minor change to the sniper rifle zoom message
2014-10-22 02:28:23 +08:00
RavingManiac
782e9f520d
Changed the wording of the sniper rifle/binoculars zoom messages.
...
Updated changelog.
2014-10-22 02:19:38 +08:00
GinjaNinja32
5b7cb1f117
Fix AI PDA showing tap messages
2014-10-21 16:46:48 +01:00
Zuhayr
fc0cf32c2a
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-10-21 18:30:37 +10:30
mwerezak
a01ed0134b
Fixes #6807
2014-10-20 22:22:51 -04:00
GinjaNinja32
c585a97162
Let's actually use these barsign sprites.
2014-10-20 23:58:26 +01:00
Zuhayr
e4ff1a3088
Hydro tweaks, fixes #6808
2014-10-21 09:10:23 +10:30
Chinsky
bad385e1d1
Merge pull request #6791 from Zuhayr/dev
...
Removes references to the Syndicate and renames nuclear emergency mode.
2014-10-21 01:13:17 +04:00
PsiOmega
3a7066c6c1
Replaces add_load with draw_power. Issue about silly battery handling remains. Fixes the build-error.
2014-10-20 19:18:27 +02:00
GinjaNinja32
c5bba7f3a5
Re-move resource update
2014-10-20 17:26:55 +01:00
mwerezak
9afd8fe3c5
Fixes radio code conflict with galactic common
2014-10-19 21:52:04 -04:00
Chinsky
3796c034f3
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev
...
Conflicts:
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
maps/tgstation2.dmm
2014-10-20 04:52:45 +04:00
Chinsky
0660dd392b
Merge pull request #6785 from mwerezak/clothing-icon-update
...
Fixes #6783
2014-10-20 03:53:17 +04:00
