Commit Graph

10691 Commits

Author SHA1 Message Date
PsiOmega
372a08b32b Merge remote-tracking branch 'upstream/dev' into NewThermals 2015-04-05 23:03:54 +02:00
Loganbacca
2063ebb8d8 Reflex runtime fix
- Fixed runtime when reflex shooting targets
- Fixed runtime when stopping aiming at a target which has lost its connected client
2015-04-05 23:42:01 +12:00
PsiOmega
d3a1ddfa09 Thermal/NVG changes.
Thermals/NVGs can now be toggled on/off from the GUI action bar, same as mesons.
Adds charge sound for special goggles.
2015-04-05 09:54:55 +02:00
GinjaNinja32
fb235bf82c Nicer formatting of weapon firing text. 2015-04-05 08:29:59 +01:00
Chinsky
c86706f0d3 Merge pull request #8699 from mwerezak/docking-update
Adds docking support for multishuttles
2015-04-05 09:49:59 +03:00
Raptor1628
cf74e22870 Hardsuit Stuff
Icons for all modules and control modules, two new suits, some modified
stats. Station suits are now split, with their spawned "equipped"
version having modules and access requirements, and their parent type
having neither.
2015-04-04 17:59:10 -04:00
Mustafa Kalash
3c767c50fa Refactors 2015-04-03 21:33:33 -04:00
Mustafa Kalash
94a56e3c2b Adds a toggle for allowing a target to use a radio (handheld or headset.) 2015-04-03 17:42:16 -04:00
mwerezak
2217407dca Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into docking-update 2015-04-03 15:14:44 -04:00
mwerezak
f2e816e76e Merge remote-tracking branch 'upstream/dev' into docking-update 2015-04-03 15:04:32 -04:00
PsiOmega
8e55ad8114 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/mob.dm
2015-04-03 09:33:05 +02:00
PsiOmega
4326b8c5d8 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-04-03 09:22:23 +02:00
mwerezak
a560acd3da Makes reflex shooting more obvious
Reflex shooting now has a different colour than regular shooting, to prevent mixups
2015-04-02 21:54:35 -04:00
mwerezak
a7e07fc312 Fixes #8716 2015-04-02 17:41:36 -04:00
Chinsky
96dd9df079 Merge pull request #8704 from Zuhayr/dev
Fixes
2015-04-02 23:49:54 +03:00
Chinsky
c584155edd Merge pull request #8688 from PsiOmegaDelta/Events
Adds more events, misc event changes.
2015-04-02 23:43:45 +03:00
Chinsky
76ef8c710c Merge pull request #8689 from PsiOmegaDelta/SecLevels
Allows admins to more easily set security levels.
2015-04-02 23:43:26 +03:00
Chinsky
8af8383732 Merge pull request #8691 from PsiOmegaDelta/EventFixes
Fixes event weights not being affected by having been fired before.
2015-04-02 23:43:24 +03:00
PsiOmega
ca70ac1efe Fixes #8582.
simple_animal/Life() did not terminate properly on death.
Caused issues with bears that would update their icons if Life() returned true (despite having called death).
2015-04-02 09:47:20 +02:00
mwerezak
fbd1ddade4 Adds refresh button, fixes arrivals docking frequency. 2015-04-02 00:26:45 -04:00
Zuhayr
1673e8d514 Added organs to the processing list when removed, oops. 2015-04-01 20:54:34 -07:00
Zuhayr
8def76f849 Removing some debugs. 2015-04-01 18:06:46 -07:00
Zuhayr
84b903cf69 Fixes #8702 properly. 2015-04-01 17:57:28 -07:00
Zuhayr
3cc34ab55e Organ tweaks/fixes. 2015-04-01 17:38:15 -07:00
Zuhayr
294a1ff1f1 Should fix #8710 2015-04-01 17:27:06 -07:00
Zuhayr
c3eb6102b4 Added a few null checks. 2015-04-01 17:15:59 -07:00
Zuhayr
6e0e98469c Fixes #8709 2015-04-01 16:59:48 -07:00
Zuhayr
1070a8f63c Adds weedkiller smoke checks to hydro trays and spreading plants. 2015-04-01 07:25:09 -07:00
Zuhayr
5326abb67d Fixes #8611 2015-04-01 07:24:53 -07:00
Zuhayr
63a2fc6bff Fixes #8682 2015-04-01 07:05:58 -07:00
Zuhayr
8475be5d4e Fixes a few incidental bugs with the antag and organ changes. 2015-04-01 06:33:47 -07:00
Zuhayr
5983f01d22 Fixes #8618 2015-04-01 05:56:46 -07:00
Zuhayr
ed54a8aaa7 Fixes #8693 2015-04-01 05:35:59 -07:00
Zuhayr
57f5c5d15f Fixes #8702 2015-04-01 05:18:32 -07:00
GinjaNinja32
400440f077 Fixes #8700 2015-04-01 07:47:15 +01:00
PsiOmegaDelta
015fb291fa Merge pull request #8698 from mwerezak/gun-icons
Fixes swapped STS-35 item states
2015-04-01 06:32:29 +02:00
PsiOmegaDelta
d430f928e8 Merge pull request #8694 from Yoshax/freejobfeedback
Adds feedback and logging for free job slot verb
2015-04-01 06:31:28 +02:00
mwerezak
7366df388b Merge remote-tracking branch 'upstream/dev' into docking-update 2015-03-31 20:50:02 -04:00
mwerezak
01ce8d4a1f Fixes #8696
Fixes #8696, and updates other usages of drop_item() where appropriate.
2015-03-31 20:30:06 -04:00
mwerezak
5fe486dfe3 Fixes swapped STS-35 item states
Renames the states to prevent future confusion
2015-03-31 20:26:31 -04:00
Yoshax
25fa1a2258 Adds feedback and logging for free job slot. 2015-03-31 19:01:17 +01:00
Kelenius
524ea8aeb7 Fixes a typo 2015-03-31 18:37:15 +03:00
PsiOmega
9de5b19625 Fixes event weights not being affected by having been fired before.
This mainly due to using a completely incorrect list, event_last_fired (used by the old system) instead of last_event_time.
2015-03-31 15:53:16 +02:00
PsiOmega
e1f8af1997 Cleans up announcement sound handling. Plays communication blackout sound at half volume. 2015-03-31 14:51:22 +02:00
PsiOmega
c4a10f05b1 Allows admins to more easily set security levels.
Also alters the sound for code delta.
2015-03-31 14:32:28 +02:00
PsiOmega
93ac826f02 Adds more events, misc event changes.
Only two more this time:
Random space dust attack.
Random gravity failure.

Moves space vines from moderate to major events, due to its now more dangerous nature.

Removes now irrelevant alien/ninja customized event handlers.

Adds Excel sheet for aiding in event probability calculations.
2015-03-31 13:07:27 +02:00
mwerezak
398459c2e7 Merge remote-tracking branch 'upstream/dev' into inventoryfix
Conflicts:
	code/modules/organs/organ_external.dm
2015-03-31 02:13:22 -04:00
mwerezak
5484a30a13 Allows gloves/shoes to be worn even if one hand or foot is missing.
Having a hand or foot removed still drops the worn items, so it still can be used to steal someones gloves/shoes.
The difference is that you can now pick up the dropped item and wear it again if you still have the other hand/foot left.
2015-03-31 01:40:15 -04:00
Chinsky
65f61122b5 Merge pull request #8604 from Zuhayr/limbs
Limb objects, severing and cybernetics
2015-03-31 08:38:54 +03:00
mwerezak
9b2f5cea33 Merge remote-tracking branch 'upstream/dev' into inventoryfix
Conflicts:
	code/game/gamemodes/revolution/rp-revolution.dm
	code/game/machinery/kitchen/juicer.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/structures/stool_bed_chair_nest/stools.dm
	code/modules/destilery/main.dm
	code/modules/hydroponics/biogenerator.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/carbon/monkey/inventory.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm
2015-03-31 01:37:55 -04:00