Zuhayr
066482de93
Readds predefined ambrosia items.
2015-02-13 05:53:45 +10:30
Zuhayr
8fb5836e4f
Generalized fruit products properly.
2015-02-13 03:52:46 +10:30
Zuhayr
08b26e8e4c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro
2015-02-11 14:35:58 +10:30
Chinsky
d1de94c70e
Merge pull request #8082 from Kelenius/ofMachinesAndParts
...
Update for machine upgrades and some science
2015-02-10 23:24:19 +03:00
Kelenius
1368707150
Borg charger now uses cell
2015-02-10 14:39:54 +03:00
Chinsky
712b952985
Merge pull request #8089 from GinjaNinja32/pai
...
NanoUI pAI, more modular pAI software
2015-02-10 10:05:20 +03:00
PsiOmegaDelta
79aacd9f30
Merge pull request #8081 from comma/maximumtrinkets
...
Accessories update.
2015-02-10 06:51:30 +01:00
PsiOmegaDelta
973bc1c0f3
Merge pull request #8071 from RKF45/newpaint
...
Generic Paint II: Fun with Paint
2015-02-10 06:48:32 +01:00
GinjaNinja32
538ee11cb1
pAI rework
2015-02-09 01:58:54 +00:00
Raptor1628
76f4001cc1
Paramedic Job Fixed
...
Adds Paramedic job as outlined on the forums. Reduces MD access to EVA,
adds some minor EMT clothing stuff, and fixes #8020 and the medgreen
armband while I was piddling around in sprites.
EMT alt title and indent fixed.
Now less broken.
2015-02-08 17:23:02 -05:00
Kelenius
e6dc9d36fd
Update for machine upgrades and some science
...
Also adds RPED and makes biogenerator and borg charger constructible .
2015-02-08 15:39:11 +03:00
Chinsky
30de86c081
Accessories update.
...
Moves them away from 'tie' legacy - path change, and different code files.
Changed single hastie var into accessories list, to allow multiple articles worn at same time. Updated all affected places in code to work with it.
Currently any number of decorative accessories can be attached, one utility (holster/webbing) and one armband.
2015-02-08 12:35:50 +03:00
Zuhayr
402987edc3
Merge with dev.
2015-02-07 14:44:55 +10:30
mwerezak
0b8940da79
Merge remote-tracking branch 'upstream/dev' into boolit
2015-02-06 20:23:05 -05:00
mwerezak
5494b4d8c9
Supply packs, autolathe recipes, magazine and box definitions.
2015-02-06 20:16:35 -05:00
unknown
39b467c9da
New bullet types, projectile rewrite
...
* Refactors projectile Bump()
* Converts projectile_type var strings to paths
* Reorganizes bullet projectile paths
* Made a pass through all the bullet_act() definitions. Mainly ensured that damage_type is checked when dealing damage to certain objects. Removed stupid /turf bullet_act() override, replaced with on_hit() overrides on the relevant projectiles.
* Adds shotgun pellets projectile. Adds Raptor's shotgun slug sprite.
* Gives stunshots more of their own identity, refluffs them as taser cartridges for shotguns. They still aren't obtainable anywhere unless spawned.
* Makes projectiles pass through girders and cultgirders with a certain probability, unless the girder itself was clicked.
* Projectiles are also able to pass through grilles. Low damage projectiles have a chance to be blocked by grilles. High damage projectiles have a chance to have some damage absorbed by the grille.
* Makes projectiles for blanks invisible.
* Adds flash bullet types
* Adds support for 'penetrating' projectiles
* Swaps .45 and 9mm projectile types. .45s hit slightly harder, 9mils have more ammo capacity.
2015-02-06 20:09:32 -05:00
RKF45
5fc1ae395d
All cleaning removes paint
...
Paint works on mobs and objects
2015-02-07 01:41:08 +01:00
RKF45
2c78d480f1
Mops clean paint too
...
For painted walls, I guess
2015-02-07 00:18:56 +01:00
RKF45
0ad5195af2
Cleaning up
2015-02-06 23:55:11 +01:00
RKF45
172282b638
Cleaning up paint buckets
...
Remover is finally gone
2015-02-06 23:40:54 +01:00
RKF45
76cfa4fb40
Named crayons
2015-02-06 23:22:05 +01:00
Chinsky
fc4e6796ce
Merge pull request #8035 from PsiOmegaDelta/CanHasNano
...
NanoUI/Topic make-over
2015-02-06 00:15:04 +03:00
PsiOmega
a073cba477
Merge remote-tracking branch 'upstream/dev' into CanHasNano
...
Conflicts:
code/setup.dm
2015-02-05 12:37:15 +01:00
Zuhayr
c5e2feb5f1
Merge with dev.
2015-02-05 20:24:06 +10:30
Chinsky
f8b94456ba
Merge pull request #7844 from Kelenius/ofDryingAndRacks
...
Adds drying racks, tobacco, and updates pipes
2015-02-04 18:15:13 +03:00
Zuhayr
fdf0360a69
Collapsing all fruit into one object type. Refactoring reagent grinder and removing juicer. WIP.
2015-02-04 10:55:33 +10:30
Zuhayr
2d1fd2dd2f
Added report printing for plant scanners.
2015-02-04 10:53:09 +10:30
Zuhayr
78e61d9ccd
Tweaks to xenoflora, added plant icons and colours to all plants.
2015-02-04 10:42:39 +10:30
PsiOmega
566f6a104e
Carded AIs can no longer access cameras through camera consoles.
...
Also includes fixes for hidden uplinks.
2015-02-03 23:44:35 +01:00
Zulker Nayeen Nahiyan
0a3f523066
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
...
Conflicts:
code/__HELPERS/maths.dm
code/__HELPERS/type2type.dm
code/modules/clothing/head/hardhat.dm
code/modules/clothing/spacesuits/captain.dm
code/modules/clothing/spacesuits/miscellaneous.dm
code/modules/clothing/spacesuits/rig/rig_pieces.dm
code/modules/clothing/spacesuits/rig/suits/light.dm
code/modules/clothing/spacesuits/spacesuits.dm
code/modules/clothing/suits/armor.dm
code/modules/clothing/suits/utility.dm
code/modules/events/event_manager.dm
code/modules/mob/living/living.dm
code/setup.dm
2015-02-04 04:44:09 +06:00
Kelenius
536388978f
Conflict fix
2015-02-03 20:57:16 +03:00
Kelenius
0e7ed6aef4
Merge branch 'dev' into ofDryingAndRacks
2015-02-03 20:51:27 +03:00
Chinsky
84472462ab
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into firefirEFIREBURNAHAHAHA
...
Conflicts:
code/modules/mob/living/living_defines.dm
2015-02-03 18:30:18 +03:00
Chinsky
95ff9570ee
Merge pull request #7930 from RKF45/newpaint
...
Generic paint
2015-02-03 18:15:42 +03:00
Chinsky
aa7fde250c
Merge pull request #7801 from Mloc/bs12-glowypipes
...
refactor buckling + glowy HE pipes
2015-02-03 18:12:09 +03:00
Chinsky
1c3b1087dd
Merge pull request #7582 from Zuhayr/richard
...
Do you like hurting other people?
2015-02-03 18:10:34 +03:00
PsiOmega
1732d0c79a
Merge remote-tracking branch 'upstream/master' into TheGreatPurge
...
Conflicts:
code/WorkInProgress/computer3/computers/message.dm
code/WorkInProgress/kilakk/responseteam.dm
2015-02-03 14:16:14 +01:00
Chinsky
95eacd2185
Merge pull request #8008 from volas/sanitize_procs
...
Fixes for some sanitize moments
2015-02-03 15:08:47 +03:00
Chinsky
72463a35f3
Another pass at WIP folder
2015-02-03 12:14:13 +03:00
Chinsky
2a1f0849d8
Cleaned out my WIP folder.
2015-02-03 08:27:18 +03:00
D Anzorge
abeb634d01
Make borg radio window tell if loudspeaker is on
2015-02-02 16:27:14 -05:00
D Anzorge
609f9848bc
Fix borg radio weirdness
...
Borg radio interface toggling was backwards: when usr got the message that the subspace mode was
disabled, the radio would actually enter subspace mode.
2015-02-02 16:27:14 -05:00
RKF45
6577cd2a55
Merge remote-tracking branch 'upstream/dev' into newpaint
...
Conflicts:
code/game/objects/items/weapons/paint.dm
2015-02-01 23:04:18 +01:00
RKF45
4d8dd50cea
Mixing of paint
...
The generic paint can now be mixed and tranferred.
2015-02-01 22:54:18 +01:00
volas
8abd7d0735
correction of all copytext(sanitize(..)) to sanitize(copytext(..))
2015-02-01 22:54:56 +03:00
RKF45
4eb3e16f72
Reviewing paint recipes
...
All recipes make "paint" and have different colours via var/resultcolor
White paint can also be made non-ghettoly.
2015-02-01 01:34:39 +01:00
Chinsky
b995c856a9
Merge pull request #7924 from Kelenius/ofTablesAndPass
...
Removes FPRINT and TABLEPASS flags
2015-01-30 16:17:41 +03:00
Zuhayr
b280cb6d42
Fixes #7919
2015-01-29 11:27:56 +10:30
Loganbacca
34d44f8732
Tape fixes
...
- Fixed taping paper bundles
- Reduced issues with sticking papers around corners
- Removed a couple of colons from paper_bundle.dm
2015-01-26 15:16:27 +13:00
RKF45
c5afd47bc6
Eating crayons
2015-01-25 17:11:06 +01:00
