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
c953e279a4
Update from dev.
2015-02-12 23:15:47 +10:30
Zuhayr
a8089d4437
Merge master into dev.
2015-02-12 23:01:08 +10:30
Zuhayr
605c1eea88
Merge pull request #8101 from PsiOmegaDelta/MedCam
...
Map Fixes and Additions.
2015-02-11 15:13:20 +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
PsiOmega
cd5a2fc52e
Bonus: Makes the tinted windows respect power failures.
2015-02-10 10:16:58 +01: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
PsiOmegaDelta
ec1fe5edc7
Merge pull request #8090 from comma/master
...
Fixes #8009
2015-02-09 08:38:50 +01:00
Chinsky
2f52020ce4
Fixed backwards check
2015-02-09 08:26:45 +03:00
Chinsky
5496c7bbf0
Fixes #8009
...
Fixed flaslights producing infinite light/
2015-02-09 08:05:24 +03: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
b83f1ac3d2
Adjustable tint windows. Use buttons to change opacity. Super advanced technology to introduce milder alternative to metal shutters everywhere.
2015-02-06 10:33:41 +03:00
Chinsky
3ea720fd9d
Buttons refactoring. Introduced wonders of inheritance, cutting down on inconsistencies and copypaste.
2015-02-06 09:53:05 +03:00
mwerezak
41816c26bf
Fixes windows taking excessive damage from projectiles
2015-02-06 00:03:09 -05: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
Zuhayr
5890fa3c4b
Added plant controller.
2015-02-05 15:53:20 +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
Skully71
3d2abddaa7
Add random single object to enable a given object to be spawned at chance
2015-02-04 10:41:47 +01: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
09e4be2b1b
Collapsed space vines, glowshrooms and biomass into one spreading-plant system.
2015-02-04 10:49:41 +10:30
Zuhayr
d616040e8c
Renamed some files, did some path replacements
2015-02-04 10:48:18 +10:30
Zuhayr
c789f58b3c
Converted seed genetics over to a macro-based list of traits
2015-02-04 10:47:24 +10:30
Zuhayr
78e61d9ccd
Tweaks to xenoflora, added plant icons and colours to all plants.
2015-02-04 10:42:39 +10:30
Zuhayr
26fe1a11a4
Adds exploding fruits.
2015-02-04 10:39:14 +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
