Commit Graph

14107 Commits

Author SHA1 Message Date
PsiOmegaDelta
7ef07aeca6 Fixes hemostat surgery.
Port of https://github.com/PolarisSS13/Polaris/pull/381.

# Conflicts:
#	code/modules/surgery/organs_internal.dm
#	code/modules/surgery/robotics.dm
#	code/modules/surgery/surgery.dm
#	polaris.dme
2015-12-02 14:42:41 +00:00
Neerti
e0986cb7ab Ballistic weapons will now correctly say that the firing mode was changed. 2015-12-02 08:04:34 -05:00
Neerti
d50e2afae9 Merge pull request #387 from Neerti/12/2/2015_fuck-dream-maker-for-its-horrible-search-abilities-because-i-broke-armor-god-damn-how-hard-is-it-to-look-up-if(armor
Fixes armor making melee combat utterly useless.
2015-12-02 06:39:39 -05:00
Neerti
c0412094f6 Fixes armor making melee combat utterly useless. 2015-12-02 06:30:20 -05:00
Atlantis
c7e7c05a34 Fixes #11546 2015-12-02 11:14:41 +01:00
Zuhayr
7801c2dc3b Minor runtime fixes. 2015-12-02 20:11:31 +10:30
Zuhayr
2f344ed111 Adds a confirmation to user-activated ninja self destruct. 2015-12-02 19:55:54 +10:30
Zuhayr
6623c1650f Rig unEquip() amendments. 2015-12-02 19:55:43 +10:30
Zuhayr
1b6282b43f Fix for a merge error resulting in very wonky hardsuit behavior. 2015-12-02 19:55:32 +10:30
Zuhayr
1eabcfeffe Removes a leftover world << 2015-12-02 19:55:23 +10:30
Zuhayr
0c23217d7c Fixes drop pods activating each other's doors. 2015-12-02 19:54:57 +10:30
PsiOmegaDelta
89d20b9195 Updates macro/span use. 2015-12-02 09:25:00 +01:00
PsiOmegaDelta
2560c13816 Fixes hemostat surgery.
Port of https://github.com/PolarisSS13/Polaris/pull/381.
2015-12-02 08:56:58 +01:00
Jon
03a4b91ad0 Removes erroneous world.log line. 2015-12-02 03:47:05 +00:00
Jon
230d676c3f Changes the arbitrary failure return for surgery from 2 to -1. This is because ORGAN_BLEEDING in damage_organs.dm is now 2 so some statements evaluate to 2, which causes bleeding clamp surgery to fail as it triggered the "This is an error that's already been dealt with" condition coincidentally.
Surgeries which report failures (like trying to stick a brain in someone who's already got one) now throw back a -1 not a 2.
2015-12-02 03:45:24 +00:00
Mark9013100
97a52b3815 Replaces the default berets with /tg/'s. 2015-12-01 22:26:30 -05:00
SinTwo
1f42ba7961 BERETS DAMMIT 2015-12-01 20:53:25 -05:00
Zuhayr
c8b6986b62 Merge pull request #11551 from PsiOmegaDelta/151201-DontTazeMeBro
Renames the rig mounted taser.
2015-12-02 09:59:47 +10:30
Zuhayr
c2a4ee22cf Merge pull request #11316 from atlantiscze/apc-fix
Fixes #11149
2015-12-02 09:57:26 +10:30
Zuhayr
1a0eecd09a Runtime fixes. 2015-12-01 18:07:50 -05:00
Zuhayr
622fb93a3e Emergency fix for HasProximity being passed a turf. 2015-12-01 18:07:21 -05:00
Neerti
602493cc08 Removes gun firing logs due to possible lag. 2015-12-01 14:12:35 -05:00
Zuhayr
4487db9c14 Fixes several issues with drones. 2015-12-01 09:38:12 -05:00
Neerti
765ac00c6c Merge pull request #367 from Neerti/12/1/2015_armor_refactor
Refactors how armor works.
2015-12-01 04:32:30 -05:00
Neerti
062a092cfe Refactors how armor works. It's now less of a dice roll, but still retains some randomness. This makes weaker armor worth using, and stronger armor not godlike.
Also fixes a bug with the auto shotgun causing runtimes.
2015-12-01 03:45:47 -05:00
PsiOmegaDelta
1a293e2d96 Renames the rig mounted taser.
Was previously called an energy gun, which could be mildly confusing.
Port of https://github.com/PolarisSS13/Polaris/pull/127.
2015-12-01 08:48:47 +01:00
PsiOmegaDelta
5a0d76d876 Merge pull request #11548 from Baystation12/master
Dev-freeze
2015-12-01 08:09:15 +01:00
Datraen
f48bdb3c66 Merge pull request #366 from Datraen/DevTweaks
Lets mods see and toggle attack logs.
2015-12-01 01:15:23 -05:00
Datraen
1886eaa066 Lets mods see and toggle attack logs. 2015-12-01 01:07:45 -05:00
Mark9013100
7a26afb464 Merge branch 'master' into 11/29/2015FixesandEdits1 2015-11-30 23:39:25 -05:00
Atlantis
e33ae21f75 Adjusts APC emag behavior
- Mostly under-the-hood changes.
- Emagged APCs may now have their panel removed with screwdriver, so you can access wires
- Emagged APCs no longer rely on locked var, instead they check for emagged var as mwerezak suggested.
2015-11-30 23:19:04 +01:00
Datraen
6f6cb4661f Merge branch 'master' into Devtweaks 2015-11-29 22:36:08 -05:00
Datraen
3506e0861c Fixes jumping, adds dev access to msay and ahelps. 2015-11-29 22:34:00 -05:00
Neerti
75c574eddd Adds verb to toggle hub visibility. 2015-11-29 22:06:05 -05:00
SinTwo
bc2f3ce654 Merge branch 'master' into Moderator 2015-11-29 13:40:27 -05:00
SinTwo
8d747eed8d Moderator Logs 2015-11-29 13:34:00 -05:00
Neerti
5b59945032 Fixes gun aiming, adds logging for aiming and firing, and ballistic weapons should no longer be named 'the three round burst' or such. 2015-11-29 12:44:10 -05:00
Mark9013100
880ba681e6 Combination of my previous PRs, mostly fixes 2015-11-29 11:13:17 -05:00
PsiOmegaDelta
2d5677109f Build mode throws now admin logs.
Fixes #11514.
2015-11-29 12:14:31 +01:00
Jon
36755f077c Removes the Resomi clothing from the custom loadout to prevent confusion as we're not intending to have Resomi crew, to my knowledge. 2015-11-27 16:58:48 +00:00
Neerti
dd05d385c5 Adds Mockingjay00's title screen.
Adds a system to randomly pick a title screen for the round.
2015-11-26 11:33:16 -05:00
Neerti
78e5701b5c Replaces most instances of Nyx to Vir. 2015-11-26 01:01:06 -05:00
Jon
782ae235e9 Changes the lobby screen's image name from "Baystation12" to "Polaris". 2015-11-24 20:19:38 +00:00
PsiOmegaDelta
9b1123cbaa Replaces misc. checks with usr.incapacitated(). 2015-11-24 14:05:04 +01:00
PsiOmegaDelta
e67ff9e903 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-24 14:02:15 +01:00
PsiOmegaDelta
0e5fc06b13 Merge pull request #11491 from Datraen/Trayfix
Fixes Non-human, Non-synth mobs (ghosts, mice) being able to interact with trays.
2015-11-24 10:48:17 +01:00
GinjaNinja32
b72cb1f45b Merge pull request #11504 from PsiOmegaDelta/151122-EMPSafeShuttle
Makes shuttle control consoles sturdier.
2015-11-23 09:28:03 +00:00
Bjorn Neergaard
0f78998377 Fix Dionea home system
Fixes #11492
2015-11-22 20:34:29 -06:00
PsiOmegaDelta
26f167453c Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-22 11:40:44 +01:00
PsiOmegaDelta
782f0a8bfb Makes shuttle control consoles sturdier.
Fixes #11501.
2015-11-22 11:37:14 +01:00