Commit Graph

955 Commits

Author SHA1 Message Date
Zuhayr
a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
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
PsiOmega
93a479099a Air alarm deconstruction fix.
Air alarms can again be deconstructed, at the price of lost convenience.
2015-02-10 10:35:45 +01: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
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
mwerezak
2d744fd47a Fixes doors being usable remotely when broken
Fixes airlock doors being able to be opened and closed remotely (by
buttons, airlocks, or docking) when broken. Also removes some redundant
code, and refactors a few checks.
2015-02-07 17:52:16 -05:00
mwerezak
5494b4d8c9 Supply packs, autolathe recipes, magazine and box definitions. 2015-02-06 20:16:35 -05:00
RKF45
2c78d480f1 Mops clean paint too
For painted walls, I guess
2015-02-07 00:18:56 +01:00
RKF45
172282b638 Cleaning up paint buckets
Remover is finally gone
2015-02-06 23:40:54 +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
GinjaNinja32
05532fd330 Merge remote-tracking branch 'upstream/dev' into supply 2015-02-03 17:22:10 +00:00
GinjaNinja32
444c7c71f3 Maps in floor painter in engineering workshop, makes it and pipe painters orderable from Cargo 2015-02-03 17:19:45 +00:00
PsiOmegaDelta
ba72db2275 Merge pull request #7866 from SparklySheep/patch-12
Adds medical belts to sterile equipment crate.
2015-02-03 16:12:40 +01:00
Chinsky
aa7fde250c Merge pull request #7801 from Mloc/bs12-glowypipes
refactor buckling + glowy HE pipes
2015-02-03 18:12:09 +03:00
volas
8abd7d0735 correction of all copytext(sanitize(..)) to sanitize(copytext(..)) 2015-02-01 22:54:56 +03:00
Loganbacca
fbabdce615 Finished renaming nuclear mode to mercenary
Mostly cleans up the admin side of things.
2015-01-27 13:42:27 +13:00
GinjaNinja32
41414e591d VV runtime fix 2015-01-21 21:16:43 +00: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
Mloc-Argent
537b78fc80 refactor buckling to be more generic
Buckling procs and vars have been moved down to /obj.
Behaviour is mostly the same, but you can buckle cuffed people to
 pipes and they will automatically unbuckle if the cuffs are removed.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2015-01-12 21:28:31 +00:00
Zulker Nayeen Nahiyan
6e550d7308 Cleanup helper files maths.dm, time.dm, type2type.dm, add macros for bit-manipulation
`maths.dm`:
	Rewrite `Gcd(x)` to remove recursive behaviour.
	Remove `RaiseToPower(x)` and its usage from `event_manager.dm`.
	Rename `Lerp()` to `Interpolate()`.
	Add `Square(x)`, which squares a number.
	Rearrange most of the functions in the file. (trigonometric functions together, etc.)

`type2type.dm`:
	Rewrite `num2hex()` and optimise `hex2num()` for superior clarity and a 100% speed improvement.
	Correct indenting, spaces, make switches more concise.

`time.dm`:
	Remove old, slanderous commented-out function `/proc/time_stamp()`

`lists.dm`:
	Add the macros, `BITTEST(bitfield,index)`, `BITSET(...)`, `BITRESET(...)`
	  and `BITFLIP(...)` for bit-manipulation and use them where 20+ files
	  do it manually, for arguments of reader clarity and standardness.
2015-01-09 21:55:11 +06:00
mkalash
f9e352b768 Gets rid of the white wire in Omega's new wire system. The background of the UI is white, so you can't read the wire's name. I replace it with dark red. 2015-01-04 22:26:41 -05:00
Kelenius
3a9d802c62 Fixes "To shuttle" button in nuke traitor panel 2014-12-29 13:08:48 +03:00
Zuhayr
bbfc6db0a3 Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right) 2014-12-23 17:38:05 +10:30
Zuhayr
e6110b61b6 Should fix #6782 2014-12-23 00:50:11 +10:30
Wild Bill
5bae906c47 Reserve PascalCase inits 2014-12-16 16:20:50 +02:00
PsiOmega
cf78fe903b Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-12-12 09:04:09 +01:00
PsiOmegaDelta
4cbfbe4bfa Merge pull request #7411 from Amunak/patch-2
Changed bloodpack crate path in supplypacks.dm
2014-12-12 09:02:50 +01:00
Amunak
74ac8caecd Changed bloodpack crate path in supplypacks.dm
It's now /datum/supply_packs/bloodpack
2014-12-12 01:37:10 +01:00
PsiOmega
087cc1882c Fixes #7366.
Kills unecessary photo datum which wasn't even used correctly anymore.
Photos have a global id for ease of synth syncing.
Changes how law/photo syncing is handled when pulsing the appropriate borg wire.
Also ensures re-synced borgs are added/removed from the appropriate AIs.
2014-12-10 21:54:57 +01:00
Atlantiscze
7754fda105 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into substation-features 2014-12-08 06:58:50 +01:00
Atlantiscze
d761eaf38c I am an idiot.
- Replaces typo which caused SMES wire pulsing to be broken.
2014-12-08 06:27:11 +01:00
Atlantiscze
39229e4a1f Few updates to SMES wiring datum:
- Pulsing input/output wires now toggles the input/output settings, instead of disabling for 60s
- Pulsing grounding wire now disables grounding until the wire is cut and mended again.
2014-12-08 03:55:35 +01:00
Zuhayr
3c66bd3920 Merge resolution. 2014-12-08 13:01:04 +10:30
Atlantiscze
994ad591e6 RCON System (v1.0)
- Allows remote control of SMES units and Breaker Boxes.
- Adds wires to SMES units. Wires may be cut/pulsed for various effects. Signallers are supported.
- RCON console(s) may be used to monitor the SMES units (which have RCON enabled) remotely, showing output loads and charge percentages.
- SMESs may be quickly discharged by cutting the grounding wire. This however comes with little risk of overload which may damage APCs on output powernet.
2014-12-08 03:30:20 +01:00
Zuhayr
74db269c40 Fixes #7266 2014-12-08 03:51:01 +10:30
mwerezak
89cef05a19 Merge remote-tracking branch 'upstream/dev' into secure-airlock 2014-12-04 17:15:27 -05:00
mwerezak
674817ff0b The wire datum UI now indicates if the wires have been randomized. 2014-12-04 16:49:18 -05:00
PsiOmegaDelta
68644b0e5e Merge pull request #7219 from Loganbacca/chairfix
Tape and chairs
2014-12-04 14:10:46 +01:00
Loganbacca
c4c90adc8e Added tape roll
- Added 1x tape roll to office supplies pack
2014-12-04 21:54:41 +13:00
mwerezak
77288fb951 Merge remote-tracking branch 'upstream/dev' into camera
Conflicts:
	code/game/machinery/portable_turret.dm
2014-12-03 23:37:02 -05:00
mwerezak
fad5506683 Cameras can be broken by weapons/projectiles, fixes
Fixes being able to show papers to AIs through deactivated cameras.
Fixes being able to break doors with TOX, OXY, and CLONE damage.
Fixes camera alarms persisting after the camera is deleted.
Fixes #7021.
Some camera cleanup.
2014-12-03 10:36:30 -05:00
Ccomp5950
25224491ce Merge pull request #7195 from PsiOmegaDelta/BloodDrive
Cargo can now order empty blood packs.
2014-12-02 20:31:04 -05:00
PsiOmegaDelta
4582c0038b Merge pull request #7205 from Mloc/bs12-setdir
refactor 'dir = ' into 'set_dir()'
2014-12-02 14:38:31 +01:00
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00:00
Amunak
2ca4ccd23a Lowered SMES coil price to 75
It is a valuable piece of technology, but alone it is not really powerful at all. This is the same price as the RUST core and TE generator, which are both admittedly much more complicated. I know this was for balance reasons, but as it is now engineers will rather steal the coils from solar panel SMESes than to deal with cargo who are not very supportive of ordering expensive stuff like this.
2014-12-01 02:27:17 +01:00
Amunak
e2a2d5f06e Upped Supermatter core price to 150 supply points
This is to prevent griefing using supermatter (it is bad if I can order four of them after ~20 minutes in game and destroy most of the station with them) and to be coherent with the lore - SM is SUPER FREAKING EXPENSIVE. Also (hopefully) makes the crew think before ejecting the SM 4noraisin.
2014-12-01 02:24:04 +01:00