Commit Graph

16986 Commits

Author SHA1 Message Date
Zuhayr
d40eecd163 Merge pull request #8117 from mwerezak/textmacros
Replaces text expressions with macros
2015-02-12 18:49:16 +10:30
PsiOmegaDelta
baf6a6f859 Merge pull request #8112 from DeeUnderscore/vendor-cash
Vending machines: NanoUI, cash and other stuff
2015-02-12 09:08:29 +01:00
mwerezak
5b5e16916f Replaces text expressions with macros 2015-02-12 01:55:12 -05:00
Atlantiscze
4c4411259a PACMAN Generator NanoUI
- Gives PACMAN type generators NanoUI, instead of the old UI
- Example screenshot: http://i.imgur.com/QhQEw1c.png (Red usually means it's bad. In this case, generator is operating at 10 power level, but maximal safe level is 4 (it's varedited to these values, normally it would be only 5/5). Overheats also give warnings (warning shown on screenshot is last warning which occurs approximately 20 seconds before explosion). Fuel is measured in cm3. For simplicity, 1 sheet = 1000cm3
2015-02-12 06:09:42 +01:00
D Anzorge
7572ec427a Add an extra check to vending's Topic()
Topic() now checks if it really can vend items with current category config,
in case the request was malformed/rewritten
2015-02-11 20:02:23 -05:00
Atlantiscze
01b8873b9d Fixes PACMANs not working 2015-02-12 01:05:16 +01:00
D Anzorge
cee2d2502a Make vending machines stop selling things if vendor account is suspended 2015-02-11 10:42:50 -05:00
D Anzorge
9dffc8f922 Add NanoUI to vending machines
Error messages are now displayed in the NanoUI interface, instead of going to
the text log. Wire UI now consistent with other wire-enabled wire devices
that use NanoUI.
2015-02-11 10:42:50 -05:00
D Anzorge
b826e5bb77 Rewrite and refactor vending.dm
Remove some redundant procs and /obj/machinery/vending members. Rework the way
product lists and advert lists are stored within /obj/machinery/vending.

/obj/machinery/vending now uses a simpler way of storing the product list. The
old variables, `products`, `contraband`, etc., are still used for initialization
of the new list, but are not used beyond that.

This commit removes colors from vending lists in anticipation of introducing
NanoUI.
2015-02-11 10:42:50 -05:00
Zuhayr
605c1eea88 Merge pull request #8101 from PsiOmegaDelta/MedCam
Map Fixes and Additions.
2015-02-11 15:13:20 +10:30
D Anzorge
119005d515 Refactor and make vendors record transactions
Payment code is now more modular and less redundant. Vending machines now
record all transactions, including cash transactions.
2015-02-10 21:01:05 -05:00
D Anzorge
1acce5dc59 Add cash purchases to vending machines 2015-02-10 21:00:59 -05:00
D Anzorge
6d3e6c2246 Change ewallets to work like ID cards
Instead of having to insert ewallet before making purchase, ewallets can now be swiped in place of ID card
2015-02-10 21:00:59 -05:00
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
Chinsky
4f1afb3747 Merge pull request #8098 from MrSnapwalk/TheseArmsWereMadeForClamping
[Ready for Merge] Custom Item Update/Addition
2015-02-10 09:23:47 +03:00
Chinsky
ec6278f028 Merge pull request #8097 from mwerezak/projectile-fix
Fixes errors introduced by merge
2015-02-10 09:23:09 +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
Zuhayr
ffc05aecfa Merge pull request #8091 from PsiOmegaDelta/Cleanit
Minor cleanup in setup.dm
2015-02-10 13:41:16 +10:30
MrSnapwalk
05f14ccd84 Updates /obj/item/clothing/under/fluff/parkereliza and adds /obj/item/clothing/suit/fluff/parkereliza to the code. 2015-02-09 19:34:43 -06:00
mwerezak
d8a8384c41 Fixes errors introduced by merge
Fixes errors introduced by commit
fac32d07e9.

Grabbed the version of projectile.dm from the parent commit and changed
the paths by hand (again).
2015-02-09 17:53:47 -05:00
Chinsky
1c4734c4e3 Merge pull request #8088 from Raptor1628/dev
Paramedic Job Fixed
2015-02-10 01:00:08 +03:00
Zuhayr
ec6bb08a58 Merge pull request #8012 from SkyMarshal/icarus
Adds two admin weapons and refactors wall damage code.
2015-02-09 22:25:22 +10:30
GinjaNinja32
70094884ff Fixes, code cleanup, adds the messenger I forgot last night 2015-02-09 10:41:08 +00:00
PsiOmega
e1e5d993dd Minor cleanup in setup.dm
Fixes #8074.
2015-02-09 08:27:38 +01:00
Chinsky
2f52020ce4 Fixed backwards check 2015-02-09 08:26:45 +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.

![](http://i.imgur.com/vOSoJy0.png)
2015-02-08 17:23:02 -05:00
PsiOmega
91b971b223 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-02-08 20:29:03 +01: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
SkyMarshal
a78ef81712 To make PsiOmegaDelta happy
I hate this format.  Bluh bluh huge bitch
2015-02-08 04:04:06 -07:00
SkyMarshal
c8d6214657 Fix indent thing for pointdefense 2015-02-08 04:03:19 -07:00
SkyMarshal
84c40171e7 The icarus gun now acts as a spotter. The Icarus can now be fired via adminverbs. 2015-02-08 04:03:19 -07:00
SkyMarshal
dadea3c7fa Adds two admin weapons and refactors wall damage code.
The Icarus is now fireable in gun form.  The point defense mode fires several lasers one after the other so that it can penetrate.  The main gun mode fires a modified meteor.  Also added an "abstract weapon" which has the projectile type settable for admin shenanigans.
Walls now lack an armor variable, which is replaced with buffed health.  Normal walls take 4 shots with a normal laser or 5 emitter bursts to destroy.  Reinforced walls now take 20 normal laser shots or 28 emitter shots.
Added some proactive runtime protection to logging for projectile impacts.  Without a valid firer, the jump button is linked to the victim.
2015-02-08 04:01:35 -07:00
Chinsky
de3e81657d Added moar sanity. 2015-02-08 12:45:50 +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
RKF45
13f09d95c8 Juice paints 2015-02-08 01:17:10 +01:00
RKF45
db6ff13f5f No painting ghosts!
Holograms can be coloured, though
2015-02-07 23:59:34 +01:00
Ccomp5950
8f2720b179 Merge pull request #8052 from mwerezak/boolit
New bullet types, projectile refactor
2015-02-07 14:07:22 -05:00
mwerezak
fac32d07e9 Merge remote-tracking branch 'upstream/dev' into boolit
Conflicts:
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
2015-02-07 00:57:04 -05:00
Ccomp5950
33e2fae704 Merge pull request #7967 from Kelenius/ofSlimesAndHumans
Update for the slimes
2015-02-07 00:20:13 -05:00
Ccomp5950
3ba295dadb Merge pull request #8073 from Loganbacca/projectilescleanup
Code cleanup
2015-02-07 00:17:24 -05:00
mwerezak
414ad6b6da Merge remote-tracking branch 'upstream/dev' into pacman
Conflicts:
	code/modules/power/port_gen.dm
2015-02-06 23:32:39 -05:00
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