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
22,580 Commits 8 Branches 0 Tags
bf24ac82b81ba0f80b08c71a49c2041cda45d5f3
Commit Graph

9990 Commits

Author SHA1 Message Date
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
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
mwerezak
a679d22db8 Cleaner click parameter handling 2015-02-08 19:42:18 -05:00
mwerezak
9e62e08d2e Absolute paths 2015-02-08 19:39:41 -05: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
Loganbacca
7cc440aecc Absolute paths 
- Cleaned up projectile.dm and beams.dm
 2015-02-07 13:37:12 +13:00
GinjaNinja32
f0e92023f0 Fixes startup runtime 
Fixes #8062
 2015-02-06 08:54:28 +00:00
Chinsky
3ddd0b480f Merge pull request #8061 from Baystation12/master 
master -> wiz
 2015-02-06 10:41:12 +03:00
Chinsky
3df6d38d2d Merge pull request #8047 from Neerti/1_30_2015_new_shuttle 
Expanded Escape/Transfer Shuttle
 2015-02-06 02:32:04 +03:00
Chinsky
3384f13a31 Merge pull request #8029 from GinjaNinja32/viro 
Virology rework
 2015-02-06 00:18:13 +03:00
Chinsky
2100c51905 Merge pull request #8042 from PsiOmegaDelta/HearItSayIt 
Silicons now have some timestamped input
 2015-02-06 00:15:15 +03:00
Chinsky
abd3396a13 Merge pull request #8041 from PsiOmegaDelta/SetMyName 
Silicons can now more easily be correctly renamed.
 2015-02-06 00:15:07 +03:00
Chinsky
fc4e6796ce Merge pull request #8035 from PsiOmegaDelta/CanHasNano 
NanoUI/Topic make-over
 2015-02-06 00:15:04 +03:00
Zuhayr
43d576dcc5 Merge pull request #8054 from mwerezak/chembottles 
Replaces chem bottles with their overlay equivalents
 2015-02-05 23:05:45 +10:30
PsiOmega
a073cba477 Merge remote-tracking branch 'upstream/dev' into CanHasNano 
Conflicts:
	code/setup.dm
 2015-02-05 12:37:15 +01:00
mwerezak
9caf76d069 Glass bottles are now dispensed with the lid on 
It seemed kind of silly that vendors, for example, would dispense
bottles with their lids off.
 2015-02-05 00:41:59 -05:00
mwerezak
8da0fb7f43 Merge remote-tracking branch 'upstream/dev' into chembottles 
Conflicts:
	code/modules/hydroponics/hydro_tools.dm - flags var
 2015-02-05 00:37:19 -05:00
mwerezak
59bbf3a883 Replaces chem bottles with their overlay equivalents 2015-02-05 00:31:56 -05:00
Neerti
6567c68ecb Merge remote-tracking branch 'remotes/upstream/dev' into 1_30_2015_new_shuttle 2015-02-04 13:34:48 -05:00
Neerti
13d8bd47e7 Adds subtype of the AI core structure to disallow latejoining. 
Fixes a bug where carding an AI would free open a slot.
Adds cameras and holopads to the shuttle and a few areas at Centcom.
Adds check to AI's Life() to make sure it won't die in areas which have magical free power.
Adds subtype of oxygen canister, which starts off very cold.  This is meant to replace the freezer on Centcom, and for the emergency shuttle's cryo.
 2015-02-04 13:29:55 -05:00
SkyMarshal
d5c8a6262a Fixes the fix for supersonic walking. 2015-02-04 10:33:39 -07:00
Ravensdale
7d502aa255 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-04 07:40:20 -08:00
Chinsky
4f541758c6 Merge pull request #8003 from Jamini/dev 
Added Tajran, Lizardfiend, and Slugfiendian depiction transformations for the CE rig
 2015-02-04 18:17:32 +03:00
Chinsky
8a46903231 Merge pull request #7830 from PsiOmegaDelta/CanTrack 
Camera tracking logic cleanup and tracking notice feature.
 2015-02-04 18:17:21 +03:00
Chinsky
f8b94456ba Merge pull request #7844 from Kelenius/ofDryingAndRacks 
Adds drying racks, tobacco, and updates pipes
 2015-02-04 18:15:13 +03:00
Chinsky
82ca870c53 Merge pull request #8028 from GinjaNinja32/beaker 
Change beakers, bottles, syringes and vials to use /image and multiplicative blending
 2015-02-04 18:14:22 +03:00
Chinsky
f386d2eb47 Merge pull request #7979 from PsiOmegaDelta/GhostSight 
Ghosts now have more sight options.
 2015-02-04 17:31:21 +03:00
Ravensdale
fcb2770004 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-04 05:15:23 -08:00
RavingManiac
8bc85c6bca Missing files added 2015-02-04 20:40:39 +08:00
SkyMarshal
952fd3a373 Fixes supersonic walking with canes. 2015-02-04 05:30:56 -07:00
PsiOmega
f045f5b2e9 Timestamped speech for silicons. 2015-02-04 10:12:01 +01:00
PsiOmega
9352932e3d Timestamped radio for silicons 
All silicons now have timestamped radio messages.
 2015-02-04 10:04:18 +01:00
PsiOmega
1a1bf4a718 Silicons can now be easily renamed. 
Moves the AI SetName proc down silicon level.
 2015-02-04 09:48:30 +01:00
PsiOmegaDelta
1eaf311b25 Merge pull request #7887 from Zuhayr/pickaxes 
Renames pickaxes to drills, resprites accordingly.
 2015-02-04 06:32:37 +01:00
Chinsky
a737dd0ca2 Merge pull request #7800 from Zuhayr/randmap 
Random map generator/distribution map refactor.
 2015-02-04 07:11:45 +03:00
Zuhayr
0091aca22c Merge with dev. 2015-02-04 11:05:35 +10:30
Zuhayr
11ec632c22 Merge branch 'randmap' of https://github.com/Zuhayr/Baystation12 into randmap 2015-02-04 11:03:44 +10:30
Zuhayr
3402912335 Merge with dev. 2015-02-04 11:03:13 +10:30
Ravensdale
84fa5379c5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-03 15:18:27 -08:00
PsiOmega
0ec47b225f Merge remote-tracking branch 'upstream/dev' into GhostSight 
Conflicts:
	code/setup.dm
 2015-02-04 00:00:17 +01:00