Commit Graph

10815 Commits

Author SHA1 Message Date
Zuhayr
78925ebd79 Minor loc oversight. 2015-04-03 18:48:49 -07:00
Zuhayr
2ae7c93582 God dammit copypaste before commit. 2015-04-03 18:47:59 -07: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
Zuhayr
29cd70cbdd Fixes robot limbs not spawning subparts. 2015-04-03 06:44:52 -07:00
Zuhayr
67c6c4321f Fixes an issue with internal organ transplants. 2015-04-03 06:18:34 -07:00
Zuhayr
eeee0dfb9f Numerous runtime/oversight fixes. 2015-04-03 06:12:36 -07:00
Zuhayr
6ce278a486 How did this sneak back in? Removes a monkey file. 2015-04-03 05:42:07 -07:00
Zuhayr
a3ed7fc033 Should fix the head and hair issues from the organ rewrite. 2015-04-03 05:41:33 -07: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
Yoshax
76bde4de93 Adds jackboots for dirty aliens to custom loadout 2015-04-02 23:21:52 +01:00
mwerezak
a7e07fc312 Fixes #8716 2015-04-02 17:41:36 -04:00
volas
2622d2dbfc sanitize() refactor: fourth pass 2015-04-03 00:40:57 +03:00
Yoshax
e425105349 Does the span class stuff 2015-04-02 21:50:14 +01: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
Yoshax
61691a9603 Adds emergency message for AI 2015-04-02 21:09:48 +01:00
PsiOmega
c305b389f7 Ports /tg/'s & /vg/'s garbage collector/object pool.
It's happening. Kind of, the code is there.
2015-04-02 14:48:28 +02: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
84302ca204 Chinsky fix ur shit 2015-04-01 08:21:44 -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
PsiOmega
e6cd517f47 Area/Camera network cleanup - Part 1
Renames areas for more logical order in alarm consoles and other locations.
Begins dividing the cameras into separate networks instead of being dumped into SS13. Changes c-tags to ensure related cameras are sorted together.
Security updated first.

The AI jump-to-network command now offers a sorted list as well as quick selection (using the chat bar).
2015-04-01 13:12:36 +02:00
PsiOmega
cf45daa66c Cuts out for now unnecessary parts, to allow merge of functional code. 2015-04-01 12:51:02 +02:00
PsiOmega
56a8195d1c Merge remote-tracking branch 'upstream/dev' into CultVisualNetwork
Conflicts:
	code/setup.dm
2015-04-01 12:47:31 +02: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