Commit Graph

10719 Commits

Author SHA1 Message Date
Zuhayr
cee229733e Merge branch 'dev' of https://github.com/Zuhayr/Baystation12 into dev 2015-04-07 18:38:59 -07:00
Chinsky
175fdf57e6 Merge pull request #8703 from PsiOmegaDelta/Map
Area/Camera network refactor - Part 1
2015-04-07 21:41:06 +03:00
Mustafa Kalash
177d968933 Changes flour sacks to a condiment, so that players will be able to pour flour straight into beakers, instead of having to use the grinder first. 2015-04-06 18:40:11 -04:00
Chinsky
4a897e47b9 Merge pull request #8641 from PsiOmegaDelta/CultVisualNetwork
Cult Visual network
2015-04-06 20:19:49 +03:00
Chinsky
cbfa0ef0e8 Merge pull request #8759 from PsiOmegaDelta/NewThermals
Thermal/NVG changes.
2015-04-06 20:14:39 +03:00
PsiOmegaDelta
fd1b6343f0 Merge pull request #8655 from volas/sanitize_procs2
sanitize(), part 2
2015-04-06 15:16:17 +02:00
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
75757a48f6 Merge remote-tracking branch 'upstream/dev' into Map 2015-04-05 09:55:41 +02: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
Zuhayr
d254725766 Oversights. 2015-04-04 21:49:05 -07:00
Zuhayr
fa8ee58183 Fixes a monkey runtime and updates head reattachment surgery. 2015-04-04 20:03:54 -07: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
Zuhayr
b197cb69fa More organ fixes. Yay. 2015-04-03 21:47:37 -07:00
Zuhayr
3493b60faf Attempting to fix icon procs for organs. 2015-04-03 21:04:05 -07:00
Zuhayr
be270bb0d3 Runtime fixes. 2015-04-03 20:56:37 -07:00
Zuhayr
ee657d64f8 Fixes handle_grasp() spam. 2015-04-03 19:15:47 -07:00
Zuhayr
05e85fc134 Should fix the limb spam issue. 2015-04-03 19:11:35 -07:00
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
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
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