cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,224 Commits 8 Branches 0 Tags
69a080e2d611c6d45cb157861cade41f05d23721
Commit Graph

17479 Commits

Author SHA1 Message Date
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
mwerezak
5740f52964 Merge branch 'guns' into gun-rewrite 
Conflicts:
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/guns/energy/pulse.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/projectiles/guns/projectile/launcher.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
 2015-02-11 18:08:43 -05:00
mwerezak
611a42bb33 Gun cleanup and rewrite 
Rewrites gun.dm. Reorganizes the firing procedure into logical procs and cleans up some unnecessary variables or demotes them to the subtypes that actually care. Energy weapons that create their own projectiles no longer care about in_chamber. Launcher support is much more natural now.

Cleans up duplicated cyborg energy weapon power supply code. Adds support for energy weapons to recharge from external power sources, unifying cyborg and hardsuit mounted weapons. Incorporates the cyborg taser recharging mechanism. Cleans up laser tag gun duplication

Changes path strings to actual paths. Changes relative paths to absolute paths.

Renamed several targeting vars to make their purposes more clear.

Fixed targeting not handling firing correctly for certain subtypes.
 2015-02-11 15:46:09 -05:00
PsiOmega
49b1280b13 Tries to add more helpful information when examining a spy bug from real up close. 2015-02-11 21:39:42 +01:00
PsiOmega
12e17e666f Minor casing fix. 
I couldn't unsee the lowercase t in sentences beginning with "\the" instead of "\The". I'm sorry..
 2015-02-11 19:53:08 +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
PsiOmega
73bc5934d5 Replaces uplink Donk-pockets with Sin-Pockets. 
Sin-Pockets can be self-heated using the future magic of producing heat by mixing chemicals.
Each heated pocket contains: Doctor's Delight - 5 units, Hyperzine - 5 units, Synaptizine - 1 unit.
Overconsumption is definitely possible by the careless.

Makes the concealed cane use non-del methods.
 2015-02-11 09:55:50 +01:00
Zuhayr
605c1eea88 Merge pull request #8101 from PsiOmegaDelta/MedCam 
Map Fixes and Additions.
 2015-02-11 15:13:20 +10:30
Zuhayr
e6eab3fabf Adding more plant genes to play with. 2015-02-11 15:04:59 +10:30
Zuhayr
08b26e8e4c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-11 14:35:58 +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
mwerezak
ab6f0bf30c Merge remote-tracking branch 'upstream/dev' into gun-rewrite 
Conflicts:
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/projectile.dm
 2015-02-10 20:59:22 -05:00
mwerezak
7ccd78baa7 Makes non-edge damage sources less likely to delimb 
Notably, shotgun slugs are no longer capable of automatic decapitation
 2015-02-10 20:26:59 -05:00
mwerezak
2e6a0f4ebb Adjusts some gun force values 
Gave some of the heavier looking weapons the same force value as the
shotgun.
 2015-02-10 20:26:33 -05:00
mwerezak
1b35d5d53d Adds option for projectile guns to cycle casings 2015-02-10 20:26:07 -05:00
mwerezak
bf24ac82b8 Removes IsHandgun() proc, adds slot flag 2015-02-10 20:25:41 -05:00
mwerezak
47a1639b6d Adds removing single casings, runtime fix 2015-02-10 19:54:54 -05:00
mwerezak
ee894d6b99 Flash projectile adjustment 
Adjusts brightness, adds some effects, adds 9mm flash rounds and pistol
variant.
 2015-02-10 19:54:30 -05:00
PsiOmega
3a6c4dacd6 Adds 9mm gun with silencer, 5TC, with the option to acquire additional ammo, 2TC. 2015-02-10 22:39:40 +01:00
PsiOmega
dcb2e22e61 Adds a concealed cane sword for 2 TC. 2015-02-10 22:37:25 +01:00
PsiOmega
0daf1c2539 Merge remote-tracking branch 'upstream/dev' into SyndicateDedLongLiveSyndicate 2015-02-10 21:32:45 +01:00
PsiOmega
d0a59bcd03 Adds a health section in the uplink. 
Box of donk-pockets for 1 TC.
Combat medical kit, containing bicardine, dermaline, dexalin plus, dylovene, tramadol, and spaceacillin, for 5 TC.
 2015-02-10 21:29:29 +01: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
PsiOmega
02dc9e3008 Lightly boosts the clerical kit. 
Adds destination tagger, wrapping paper, hand labeler, and the ability to select pen color.
 2015-02-10 20:12:32 +01:00
PsiOmega
8ceaa8b5a1 Traitors can now order a spy kit 
Traitors can now order a spy kit containing 3 camera+radio bugs + a monitor for 2 telecrystals.
 2015-02-10 19:33:02 +01:00
Kelenius
1368707150 Borg charger now uses cell 2015-02-10 14:39:54 +03:00
PsiOmega
86c4e28326 Sorts uplink items by cost, then name. 2015-02-10 12:21:06 +01:00
PsiOmega
005f8ef405 Adds passive aggressive NanoTrasen balloon. 2015-02-10 12:17:25 +01: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
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
mwerezak
5ddbbc0371 Fixes ammo_magazine icon states being handled incorrectly. 2015-02-09 21:35:37 -05:00
mwerezak
fc6dfb5f1b Ammo magazine and casing update 
Rewrites ammo magazines and casings to be a bit more logical.
Updates gun/projectile and all subtypes to work with the new ammo code.
 2015-02-09 21:32:49 -05:00
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
Chinsky
4deeebfe3e Merge pull request #8093 from GinjaNinja32/pai_pulling 
Fixes pAIs being spammed with "You are too small to pull that." when being pulled
 2015-02-09 19:52:32 +03:00
Chinsky
ae54b2efc2 Merge pull request #8092 from GinjaNinja32/webbing 
Fixes webbings utilising bluespace storage for infinite storage
 2015-02-09 18:26:19 +03:00
D Anzorge
93f3b5b72a Fix a bug in isNotStationLevel() helper 2015-02-09 09:38:48 -05:00
GinjaNinja32
503eb679cc Fixes pAIs being spammed with "You are too small to pull that." when being pulled 2015-02-09 13:32:42 +00:00