Commit Graph

17479 Commits

Author SHA1 Message Date
Zuhayr
5e7133dd08 Converted baseball bats to twohanded weapons. 2015-01-20 19:14:38 +10:30
Zuhayr
8756bb99bd Adds species-specific comfort tweaks, skrell nutrition changes. 2015-01-20 19:12:35 +10:30
Zuhayr
d466d740e4 Merge pull request #7886 from Baystation12/dev-freeze
Updating from dev freeze
2015-01-20 18:49:36 +10:30
Zuhayr
aa5013fa08 Merge pull request #7885 from Baystation12/master
Updating dev-freeze from master.
2015-01-20 18:49:03 +10:30
Loganbacca
492c5382e6 Fixes item anchoring on unload 2015-01-20 13:39:01 +13:00
Kelenius
6f4f720016 Removes empty crates and replaces minigame with mastermind 2015-01-19 20:36:05 +03:00
Ccomp5950
d836103b22 Merge pull request #7860 from mwerezak/unarmed
Unarmed attack log message tweaks
2015-01-18 17:42:47 -05:00
Ccomp5950
583a1bc0c3 Merge pull request #7858 from SkyMarshal/patch-2
Fixes a null-usr edge case.
2015-01-18 17:34:04 -05:00
Zulker Nayeen Nahiyan
6f9ecab50c Cleanup according to critique, remove else returns, fix comments
`type2type.dm`
	Remove no-op `else return`s at the end of a switch and function.

`setup.dm`:
	Remove outdated comment "Must be between 0 and 1.", as noted by mwerezak.
	Fix typo in comment "FOOR_RIGHT" to "FOOT_RIGHT"
2015-01-19 04:25:25 +06:00
Zulker Nayeen Nahiyan
490027405a Merge remote-tracking branch 'origin/dev' into dev
Conflicts:
	code/modules/virus2/helpers.dm
2015-01-19 02:15:38 +06:00
SparklySheep
093c8db3b6 Fixes stupid mistake. 2015-01-18 00:00:16 -06:00
SparklySheep
691c51f45b Adds surgical caps too. 2015-01-17 22:38:10 -06:00
SparklySheep
c28d3f5b1a Adds medical belts to sterile equipment crate. 2015-01-17 14:29:06 -06:00
Kelenius
746e1acf8d Added variety (uid) field to seed vendors 2015-01-17 20:52:06 +03:00
Zuhayr
3b23e6d707 Merge pull request #7859 from mwerezak/fixes
Fixes airlock removing electronics check
2015-01-18 04:02:46 +10:30
Zuhayr
597a55c2e3 Merge pull request #7855 from Mloc/bs12-fixo
walls fix + balance + tcomms optimization
2015-01-18 04:00:19 +10:30
Kelenius
5f496524d2 Changes how sprays work and re-adds silicate
Sprays will spray directly at solid objects if they are clicked (walls,
windows, etc).
Makes removal of wall rot with plant-b-gone actually work.
Re-adds silicate with the old recipe. It repairs windows and makes them
more damage-resistant up to half damage taken.
2015-01-17 19:11:41 +03:00
mwerezak
15c7ed92e4 Unarmed message tweaks 2015-01-17 03:26:19 -05:00
mwerezak
39390a7324 Fixes airlock removing electronics check
Also stops emagged status from preventing certain door actions.
2015-01-17 02:13:17 -05:00
SkyMarshal
e5e149abd9 Fixes a null-usr edge case. 2015-01-16 23:29:48 -07:00
Mloc-Argent
87a51e27e4 optimize relay_information
useless del() call, new call deferred

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2015-01-16 23:59:39 +00:00
Mloc-Argent
4be653efec fix wall burning runtime, balance rwalls
rwalls are half as strong again because they took way too long
 to burn down

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2015-01-16 23:58:15 +00:00
Kelenius
37962065ae Adds oxygen and nitrogen to air alarm scrubber list 2015-01-16 23:02:55 +03:00
Zuhayr
bf1544c141 Merge pull request #7849 from PsiOmegaDelta/RenameAI
Fixes #7644.
2015-01-16 23:15:12 +10:30
Zuhayr
c467e99f15 Merge pull request #7848 from comma/master
Moar fix
2015-01-16 23:13:53 +10:30
Zuhayr
dd3c131463 Merge pull request #7843 from Loganbacca/freezefix
Closet fixes
2015-01-16 23:12:13 +10:30
Chinsky
9890bdc86d Merge pull request #7851 from Baystation12/dev-freeze
Dev freeze -> dev
2015-01-16 14:24:06 +03:00
Chinsky
6e7eb38c5d Merge pull request #7850 from Baystation12/master
master -> freeze
2015-01-16 14:23:03 +03:00
Chinsky
d42482c7cc Fixes #7259
Removes forks used for ribcage opening/closing since it overlapped with internal organ surgery and for some reason even priorities didn't help with that.
2015-01-16 14:18:51 +03:00
PsiOmega
02581042d7 Fixes #7644.
Makes it possible for admins to properly rename AIs, either by right-clicking the relevant AI or by using the verb in the Admin panel.
2015-01-16 11:23:08 +01:00
Chinsky
facfc0df56 Fixes #7560 2015-01-16 12:51:46 +03:00
Chinsky
b405fcd71f Fixes #7775 2015-01-16 12:26:05 +03:00
Chinsky
ac20d0b23b Fixes #7827 2015-01-16 12:19:53 +03:00
Chinsky
221f9ebe86 Fixed a few derps, added spinning 2015-01-16 11:35:56 +03:00
Chinsky
c2b5c53092 Merge pull request #7845 from Ravensdale/runtimeFixes
Fixes Cannot execute null.on removed()
2015-01-16 11:22:47 +03:00
Chinsky
46264e0194 Merge pull request #7838 from PsiOmegaDelta/EventFixes
Fixes  #7547.
2015-01-16 11:22:19 +03:00
Chinsky
badefe24d5 Merge pull request #7833 from PsiOmegaDelta/TrulyInvisible
Can no longer see the AI eye by right or alt-clicking turfs.
2015-01-16 11:22:09 +03:00
SkyMarshal
12d056106e Adjusts informative comments. 2015-01-15 17:57:52 -07:00
Loganbacca
fb945fa9ec Fixes telekinetic tape placement on airlocks 2015-01-16 13:50:13 +13:00
Kelenius
6f7a7177f2 Adds drying racks and updates pipes
You can now dry plants using a special machine, and you can now stuff
those plants into pipes to smoke then. It slowly transfers the reagents
from the plant into the smoker.
2015-01-16 02:57:59 +03:00
Loganbacca
7435f7574e Closet file reorganisation
- Moved walllocker.dm to
code/game/objects/structures/crate_lockers/closets
- Moved other unused closet files to the code/unused folder
2015-01-16 12:04:59 +13:00
Ravensdale
fdf9886053 Fixes Cannot execute null.on removed() 2015-01-15 14:48:04 -08:00
Loganbacca
780b1fb096 Fixed placing mounted modules in closets
- Fixes placing mounted modules in closets and crates
- Removed a couple of colons
2015-01-16 11:43:45 +13:00
Zuhayr
7a68bf0fc6 Merge pull request #7839 from comma/master
Hacky fixes
2015-01-16 08:53:04 +10:30
Chinsky
b4840aec54 Merge pull request #7616 from atlantiscze/boomfix
Wireless Wires Bugfix
2015-01-15 23:57:37 +03:00
Chinsky
95e4f53258 Ported TG's code for burny mobs, by ergoslavi. 2015-01-15 23:47:07 +03:00
Chinsky
0a7185c20a Fixes #7787
Made clean surgical amputation not cause huge wounds. Also moved code around a bit to prevent situations where missing limbs would get wounds (ie hands giving wounds to arms during recursive droplimb).
2015-01-15 18:59:39 +03:00
Chinsky
6f8618ded8 Fixes surgery steps never failing 2015-01-15 18:04:10 +03:00
Chinsky
47e5e51db3 Fix for the fix. 2015-01-15 17:51:45 +03:00
Zuhayr
2e0a3e4597 Merge pull request #7835 from PsiOmegaDelta/TopicLimit
Limits AI access to machinery on admin levels.
2015-01-16 01:13:21 +10:30