Commit Graph

21718 Commits

Author SHA1 Message Date
GinjaNinja32
ea6cdd4f65 Merge pull request #11724 from Ccomp5950/I_Feel_NOTHING
Fixes the icon for numbness.
2015-12-22 03:00:51 +00:00
GinjaNinja32
ae7f59a23f Merge pull request #11725 from Ccomp5950/stumpy
Stumpy hands and arms can no longer pull stuff out of bags and such.
2015-12-22 03:00:21 +00:00
GinjaNinja32
073ef62976 Merge pull request #11723 from Ccomp5950/canisters
Canisters now work in unpowered areas.
2015-12-22 02:59:55 +00:00
ccomp5950
fe62634775 Stumpy hands and arms can no longer pull stuff out of bags and such.
Resolves #11404
2015-12-21 17:56:30 -05:00
Ccomp5950
9383dfb199 Merge pull request #11719 from Spamcat/devbugs
Couple of dev fixes
2015-12-21 15:51:50 -05:00
ccomp5950
5873a92df8 Fixes the icon for numbness.
Resolves #11435
2015-12-21 15:30:26 -05:00
ccomp5950
d574d60e26 Canisters now work in unpowered areas. 2015-12-21 15:00:25 -05:00
Jon
5e73b92bd4 Fixes the general flavour text field.
The field was blanking each time it was opened to edit.
2015-12-21 09:13:46 +01:00
Spamcat
597a7723c2 Fixed people being unable to dress up.
this bug is 2lewd to stay on server
2015-12-20 21:58:05 +03:00
Spamcat
3dfbffbcd2 Fixes #11681 2015-12-20 20:05:07 +03:00
PsiOmegaDelta
4eb5ff1b87 Buckling and disability check tweaks.
Buckling now returns fully buckled if you're restrained, otherwise partially buckled.
Wraps incapacitated(INCAPACITATION_DISABLED) in a proc call to ensure there's is only one place to alter in the future.
2015-12-20 12:03:29 +01:00
PsiOmegaDelta
f6eec096e7 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/_onclick/click.dm
	code/game/objects/items/weapons/material/kitchen.dm
	code/modules/mob/living/silicon/ai/ai.dm
2015-12-20 11:55:53 +01:00
PsiOmegaDelta
c78f98754a Utensils now respect the lack of mouths, and has a delay on feeding others. 2015-12-20 11:46:42 +01:00
PsiOmegaDelta
5d3d0c5dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
2015-12-20 11:22:08 +01:00
ccomp5950
ce3587d867 Hallucinations no longer burn on the SuperMatter 2015-12-19 21:33:02 -05:00
Zuhayr
593759b4e3 Merge pull request #11713 from PsiOmegaDelta/151219-AIQdels
AI qdel() improvements.
2015-12-20 11:15:10 +10:30
PsiOmegaDelta
378f62b81e AI qdel() improvements.
AI destruction now cleans up more of its held objects and variables.
Fixes some issues with the AI powersupply qdel().
Fixes #11710.
2015-12-19 11:45:24 +01:00
Chinsky
9a156c56de Merge pull request #11513 from Karolis2011/Constructable_Cargo
Constructable Cargo
2015-12-19 09:18:45 +03:00
Chinsky
4a0d121f25 Merge pull request #11702 from PsiOmegaDelta/151217-PolarFixesMaster
No verbose cantouch check when not climbable
2015-12-19 03:13:45 +03:00
PsiOmegaDelta
79f15fca01 Compilation fixes due to issues caused by merging https://github.com/Baystation12/Baystation12/pull/11617. 2015-12-18 09:33:14 +01:00
Loganbacca
07e81c059c Fixed bullets traveling diagonally through windows
- Fixes #11465
2015-12-18 20:12:46 +13:00
Hubblenaut
28919269ee Prevents blob from growing over asteroid walls 2015-12-18 07:59:49 +01:00
Zuhayr
740d10d3fc Fixes colour issues. 2015-12-18 07:58:54 +01:00
ccomp5950
6736fb54e7 Merge branch '_base-turf' of https://github.com/mwerezak/Baystation12 into dev
Conflicts:
	code/game/area/Space Station 13 areas.dm
2015-12-17 20:25:36 -05:00
Neerti
0e3f37570a Makes radiation medication not actually irradiate you worse. 2015-12-17 17:56:36 +01:00
Hubblenaut
dce5a70572 Colors on-mob sprites 2015-12-17 17:54:44 +01:00
Hubblenaut
56d8975a19 Tweaks Filtering and Toxic Gases 2015-12-17 17:50:30 +01:00
Hubblenaut
dc2ad43dc5 No verbose cantouch check when not climbable 2015-12-17 17:44:04 +01:00
Zuhayr
64421e35ca Fixes some overlay issues with aiming. 2015-12-17 17:39:25 +01:00
Jon
d890a4ce30 Removes the else to properly for the switch statement, meaning that it no longer wipes your flavour text/thinks you're opening the general slot ever time. 2015-12-17 17:38:34 +01:00
Spamcat
905070bc96 \the 2015-12-16 20:30:26 +03:00
Spamcat
8df6ee3318 \red >> styles 2015-12-16 20:21:10 +03:00
Spamcat
485a2fdd45 Made kitchen utensils less dangerous.
#11370
2015-12-16 20:07:35 +03:00
Spamcat
f2ac9a023b pAIs no longer see custom emotes twice.
fuck i spent way too much time on a single line fix
2015-12-16 19:36:14 +03:00
Atlantis
1edc286cc3 (ANTAG) Adds Revelation Virus
- Adds revelation virus, a program that destroys the hard drive on execution. It also has chance of destroying the computer's power supply and/or battery.
- (Added): Simple UI for virus that allows user to rename the program to look like non-malicious one. The virus must be armed first via this UI. Once armed, it will trigger on next execution (even if copied/sent to other system)
- Adds extended description to programs, that contains basic information on what the program is doing.
2015-12-16 16:17:11 +01:00
Spamcat
a515f0469a Wrenched opwn welding tanks now explode when exposed to fire.
#11537
2015-12-16 17:59:05 +03:00
PsiOmegaDelta
f62f24e1ac Removes Stat() sleep.
Fixes a Stat() runtime that occasionally occur if the client was logged out when the sleep() was done sleeping.
Fixes delays when using alt+Turf click.

Makes the alt+Turf click panel only update when viewed instead. Seems like the better performance fix option in general.
Makes the alt+Turf click panel always use the "Turf" name, consistency.
2015-12-16 13:24:40 +01:00
PsiOmegaDelta
2e151ade47 Merge pull request #11696 from Baystation12/dev-freeze
Dev
2015-12-16 11:01:41 +01:00
PsiOmegaDelta
df6972dbbb Merge pull request #11695 from Baystation12/master
Dev-freeze
2015-12-16 10:51:05 +01:00
Chinsky
8413d7bd20 Merge pull request #11682 from Zuhayr/guns
Targeting rewrite.
2015-12-16 08:40:21 +03:00
Chinsky
10c2490719 Merge pull request #11688 from PsiOmegaDelta/151214-Hacktool
The hacking tool item can now be bought through the Antag Uplink.
2015-12-16 08:31:47 +03:00
Chinsky
a4f8e8ac72 Merge pull request #11654 from PsiOmegaDelta/151210-TapeTape
Adds research and medical tape.
2015-12-16 08:31:23 +03:00
Zuhayr
1ab263f662 Rewrote targeting. 2015-12-16 10:10:13 +10:30
Zuhayr
2da40e525e Removed targeting. 2015-12-16 10:09:20 +10:30
Atlantis
c93a3c755e (ANTAG) Adds NTNet DoS Traffic Generator
- Implements DoS traffic generator that is available via software downloads on emagged computers (computer emagging will be added separately)
- This generator sends DoS traffic to the NTNet relay. Amount of generated traffic is linked to connectivity (Wired: 5GQ/s, High Signal: 1GQ/s, Low Signal: 0.25GQ/s)
- NTNet relays dissipate this DoS traffic on their own (at 1GQ/s rate).
- Multiple devices running this program against one relay will have cumulative effect. For example, one wirelessly connected device would not be able to overload the relay, since it dissipates same amount of traffic as wireless device generates. On the other hand, two wirelessly connected devices would eventually result in overload and failure of relay.
- (D)DoS attacks may be stopped by manually shutting down the relay and reactivating it again
- DoS program will trigger an IDS(Intrusion Detection System) alert on execution, which will immediately show on the monitoring console. However, if IDS is disabled, only way to detect this is via the relay's UI (it will show increase in buffered traffic)
- Screenshots: http://i.imgur.com/q0gbWJm.png   http://i.imgur.com/NVobCWa.png     (Visual note: 1s and 0s in the UI change over time, amount of 1s is equivalent to approximate percentage completion of DoS attack)
2015-12-15 23:50:27 +01:00
Atlantis
326922cd8d NTNet Relay upgrades
- NTNet Quantum Relays now have simple UI that allows users to manually toggle them on/off.
- Implements simplified Denial of Service handling for relays. This will be used by next commit that will add antagonist software.
- Relays can buffer and dissipate certain amount of DoS traffic. If this traffic exceeds certain level (configurable via varedit) the relay crashes temporarily.
- Relays may be manually reset by using specific button in the UI
- Relays are now buildable. They are relatively cheap (circuit board and some cables), but the board requires Data Theory 4 research.
2015-12-15 16:13:17 +01:00
Hubblenaut
d1f14cd16d Fixes duplicate gas layers 2015-12-15 13:42:31 +01:00
PsiOmegaDelta
037e9264e1 Merge pull request #11690 from Baystation12/dev-freeze
Dev
2015-12-15 11:51:12 +01:00
Atlantis
008e122e1c NTNet P2P Transfer client
- Adds simple NTNet P2P transfer client, that allows users to send files via NTNet.
- This client can act either as actual client (downloading files), or as a server, providing one file at time.
- This may (not guaranteed) be expanded in future, to allow sharing of multiple files at once, possibly even having some sort of dedicated server architecture
- Transfer speed is calculated as lower value of connection speed of both devices (weakest link in the chain)
- Server may be protected using rudimentary password that, if set, must be entered to download the file.
2015-12-15 01:35:27 +01:00
PsiOmegaDelta
1a8fc50f1e Removes suicide code. 2015-12-14 15:57:56 +01:00