Commit Graph

19251 Commits

Author SHA1 Message Date
Atlantis
1259d71710 Merge Conflict Fix 2015-05-11 07:58:44 +02:00
Atlantis
152156018a Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-11 07:46:51 +02:00
Zuhayr
6f41625752 Added construction drone sprites from Pawn. 2015-05-11 14:46:47 +09:30
Atlantiscze
6b8f6178da Fixes
- Fixes few typos in the code
- Fixes AI Eye object being solid, therefore being able to block movement of other players.
- Fixes non-station APCs boosting CPU as others.

Implemented Suggestions
+ Selection is now done in slightly better way (Basic Encryption Hack, Hack/Unlock Cyborg, Hack AI). Only relevant entities are offered in the list.
+ Adds varedit-modifiable variables for CPU Gain and Storage boost. These variables may be used by admin in game or by tester to faster unlock abilities.
+ Slightly nerfed APC CPU power generation.
+ Reworked machine overload. Now it only works on machines which are powered. Unpowered or broken machines cannot be overloaded. /obj/machinery/power type machines (APCs, SMESs, overall most stuff that directly handles electricity) received bonus explosion strength to compensate. Machine overload also drains massive power from local APC, therefore preventing spam of this ability (normal APC should take about 2-3 of these before needing to recharge). Also, qdel instead of del.
+ System Override now uses shuffled list of APCs when hacking them, as opposed to alphabetical list.
+ CPU generation rate is now shown in Status tab.
2015-05-11 06:36:44 +02:00
mwerezak
d39fc76113 Tweaks space vines
Vines no longer mature nearly immediately, entangle less frequently.
Fixes vines entangling from adjacent turfs, which made it hard to tell
which vine was entangling someone.
2015-05-10 23:23:25 -04:00
Zuhayr
bc50ba5166 Merge resolution. 2015-05-11 11:47:24 +09:30
Zuhayr
55b3b9d151 Merge pull request #9174 from PsiOmegaDelta/ImplantLogs
Corrects implanter attack log.
2015-05-11 11:44:25 +09:30
Zuhayr
2adc8df1fa Merge pull request #8903 from Mloc/lightwrite
Lighting rewrite
2015-05-11 09:26:04 +09:30
Chinsky
ea28e4aadf Merge pull request #9126 from Techhead0/magbootsOverShoesTwo
Magboots can be worn over shoes
2015-05-11 02:48:45 +03:00
Yoshax
cb8a4c7d75 Removes redundant proc call 2015-05-10 22:03:10 +01:00
Mloc
79a191a2b5 dynamic fire colours
Fire colour + light colour changes with temperature.

Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 20:54:29 +01:00
Mloc
7780287d3a mood lighting for computers
Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 20:54:29 +01:00
Mloc
16d50c645d new object-based lighting system
Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 20:54:25 +01:00
Yoshax
5ff5214528 Removes redundant var 2015-05-10 20:51:36 +01:00
Yoshax
b0d10a6508 Fixes some stuff (+2 squashed commit)
Squashed commit:

[f63e170] Removes unnecessary /

[ac1b52c] re adds 1 bear trap i somehow accidently removed
2015-05-10 20:43:36 +01:00
Yoshax
86bf94ba07 Refactors bear traps 2015-05-10 20:09:29 +01:00
PsiOmega
144b11ed14 Adds announcement to the space vine event. 2015-05-10 20:40:49 +02:00
Mloc
733c6a4fb5 simulated var for atoms, used to filter explosions and other actions
kind of a stronger anchored var, used by lighting overlays

Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 17:06:30 +01:00
Mloc
895e78df1e more lightweight camera caching
no loops

Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 17:06:30 +01:00
Mloc
5b92057890 lights in areas that don't require power will now automatically turn on
Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 17:06:29 +01:00
Mloc
e602a7e286 remove the sub-area system
Removes area/list/related and area/master.
They were only used by the old lighting subarea system.

Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 17:06:29 +01:00
Hubblenaut
fb8812d1b7 Adds knifing, pressing eyes, jointlocking, headbutting, pushing, dancing and forcing onto the floor
fixup
2015-05-10 17:54:34 +02:00
Chinsky
6669e9631e Merge pull request #9176 from StarSmasher44/patch-1
Optimises uniqueList()
2015-05-10 18:13:17 +03:00
Chinsky
6b57189076 Merge pull request #9171 from PsiOmegaDelta/DroneSplosion
Fixes #9169.
2015-05-10 18:06:22 +03:00
StarSmasher
09b92c347f Optimises uniqueList()
Credits go to /TG/, I just figured I'd do what the other codebases do and take it over for us as well.

Changes:

Optimises uniquelist()
also renames it from uniquelist() to uniqueList()
Test 1:

1,000,000 random numbers between 1 and 7 in a list.
Clean out duplicates with current uniquelist(), once:
self: 0.362
Clean out duplicates with my new uniqueList(), once:
self: 0.184

Test 2:

3,000,000 random numbers between 1 and 7 in a list.
Clean out duplicates with current uniquelist(), once:
self: 1.069
Clean out duplicates with my new uniqueList(), once:
self: 0.496
2015-05-10 16:59:32 +02:00
Zuhayr
6e003e6d99 Merge pull request #9134 from PsiOmegaDelta/UngrabRuntime
Grabs no longer endless loop runtime.
2015-05-10 23:20:56 +09:30
PsiOmega
9d883ea914 Corrects implanter attack log.
The contents of the implant was reported in the attacker/victim log but not the admin log.
2015-05-10 15:11:37 +02:00
PsiOmega
fff5ea7840 Grabs no longer endless loop runtime. 2015-05-10 12:11:52 +02:00
Ccomp5950
929e64311e Merge pull request #9133 from PsiOmegaDelta/AntagHUDRestrictions
Enforces antagHUD restrictions.
2015-05-10 06:03:36 -04:00
PsiOmega
647298e550 Fixes #9169.
Drones can now survive entering chargers and being picked up.
2015-05-10 10:52:56 +02:00
PsiOmega
5de22ace82 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/gloves/miscellaneous.dm
2015-05-10 10:43:46 +02:00
PsiOmegaDelta
928b0a8be5 Merge pull request #9162 from volas/admin_stuff3
Admin dice
2015-05-10 10:11:29 +02:00
PsiOmegaDelta
cd264fb558 Merge pull request #9160 from GinjaNinja32/acting_manifest
Acting jobs now sort with non-acting jobs on the manifest.
2015-05-10 10:10:13 +02:00
MrSnapwalk
753d63439c Removes the leading comma in software.dm. 2015-05-10 02:24:10 -05:00
volas
a0f119b9dc Admin dice 2015-05-10 10:11:07 +03:00
MrSnapwalk
34eb2872b6 Makes the code compile by adding a comma and removing some unused lines. 2015-05-10 02:03:28 -05:00
Zuhayr
c0bb92bf34 Merge pull request #9146 from PsiOmegaDelta/AlarmConsoles
Station alarm monitor changes.
2015-05-10 15:37:50 +09:30
Zuhayr
a64f91994b Merge pull request #9151 from Yoshax/nomorechems
Removes sleepy chems from cloning
2015-05-10 15:37:21 +09:30
Zuhayr
90fd4d584e Merge pull request #9164 from comma/sterile
Made sterile gloves actually start sterile
2015-05-10 15:11:29 +09:30
MrSnapwalk
89aa07fdf9 Adds new pAI sprites by WalterJe, adds a few more emotions (neutral, silly, :^), smirk, exclamation points, and question mark). Adjusts Tudoreleuu's custom item sprite to fit the new screen sprites. 2015-05-10 00:40:13 -05:00
MrSnapwalk
7e8a173fd4 Adds 7 new AI core sprites. 2015-05-09 18:02:30 -05:00
Chinsky
6618b225a0 Made sterile gloves actually start sterile
Fixes #9163
2015-05-09 22:10:39 +03:00
Yoshax
8f9fd29c5f Removes sleeping chems from clones and adds a consistent sleep period (+1 squashed commits)
Squashed commits:

[2c002f9] Removes sleepy chems from cloning
2015-05-09 20:08:19 +01:00
Yoshax
6c121d232b Makes bear traps do damage when stepped on 2015-05-09 19:57:01 +01:00
Techhead0
95aef467a0 Magboots can be worn over shoes
Equipping magboots or a voidsuit with magboots installed will place them
over any existing shoes. Existing shoes are replaced on feet when magboots
are unequipped. Magboots cannot be worn over other magboots.
Fixes #9125
Changelog for this and my previous voidsuit changes included.
2015-05-09 14:20:03 -04:00
volas
9fadad7b33 Player age now displayed also in notes 2015-05-09 19:33:11 +03:00
volas
84696567d8 Ability to select job equipment in 'Select Equipment' 2015-05-09 19:29:26 +03:00
GinjaNinja32
75b5cf0b1e Acting jobs now sort with non-acting jobs on the manifest. 2015-05-09 15:36:04 +01:00
PsiOmega
be91976e30 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-09 11:13:05 +02:00
Kelenius
fedd0342a0 Minor chem fixes 2015-05-09 12:03:22 +03:00