Commit Graph

2676 Commits

Author SHA1 Message Date
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 0b8940da79 Merge remote-tracking branch 'upstream/dev' into boolit 2015-02-06 20:23:05 -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
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 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 aa7fde250c Merge pull request #7801 from Mloc/bs12-glowypipes
refactor buckling + glowy HE pipes
2015-02-03 18:12:09 +03:00
PsiOmega a57cd8c380 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-02-03 14:51:54 +01:00
volas 8abd7d0735 correction of all copytext(sanitize(..)) to sanitize(copytext(..)) 2015-02-01 22:54:56 +03:00
PsiOmega 6fabf503e1 Merge remote-tracking branch 'upstream/master' into dev 2015-02-01 17:39:19 +01:00
Chinsky b995c856a9 Merge pull request #7924 from Kelenius/ofTablesAndPass
Removes FPRINT and TABLEPASS flags
2015-01-30 16:17:41 +03:00
Zuhayr b280cb6d42 Fixes #7919 2015-01-29 11:27:56 +10:30
Kelenius 10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
Kelenius cee3c3eeff Replaces icon proc with image 2015-01-20 16:11:05 +03:00
Kelenius d5c1c8672d Conflict fix 2015-01-20 15:02:25 +03:00
Kelenius 1949f105f1 Removes a debug world << 2015-01-20 14:55:26 +03:00
Kelenius 5f496524d2 Changes how sprays work and re-adds silicate
Sprays will spray directly at solid objects if they are clicked (walls,
windows, etc).
Makes removal of wall rot with plant-b-gone actually work.
Re-adds silicate with the old recipe. It repairs windows and makes them
more damage-resistant up to half damage taken.
2015-01-17 19:11:41 +03:00
Loganbacca 7435f7574e Closet file reorganisation
- Moved walllocker.dm to
code/game/objects/structures/crate_lockers/closets
- Moved other unused closet files to the code/unused folder
2015-01-16 12:04:59 +13:00
Loganbacca 780b1fb096 Fixed placing mounted modules in closets
- Fixes placing mounted modules in closets and crates
- Removed a couple of colons
2015-01-16 11:43:45 +13:00
Chinsky 95e4f53258 Ported TG's code for burny mobs, by ergoslavi. 2015-01-15 23:47:07 +03: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
Zuhayr cb88860f6b Merge resolution. 2015-01-07 03:43:12 +10:30
Tramziller fb86581159 Fixes bug where girders can be destroyed with stun beams. 2015-01-04 21:12:32 +01:00
Zuhayr ce1a90c584 Fixes #7635 2015-01-03 06:43:15 +10:30
Zuhayr a76af3c7c5 Fixes #7572 2014-12-30 16:33:34 +10:30
Zuhayr c49cb0c645 Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze 2014-12-24 22:43:10 +10:30
Zuhayr a82ec718f3 Fixes #7508 2014-12-24 12:43:36 +10:30
Zuhayr 591fc164de Updating rack paths to match previous commit. 2014-12-24 12:26:43 +10:30
Zuhayr 2ed0e433aa Table/rack refactor. Fixes #7509 2014-12-24 12:14:48 +10:30
Zuhayr 7c2407c21c Fixes #5220 2014-12-23 13:23:35 +10:30
Amunak d28cb57f79 Merges upstream/dev to ref, resolves merge conflicts 2014-12-18 03:44:28 +01:00
Amunak d20ccdb6b4 More name updates and refactoring for research
Also fixes compile errors
2014-12-18 03:26:55 +01:00
Amunak 4882074739 Code formatting, EOL at EOF fixes, refactoring 2014-12-18 03:11:49 +01:00
Amunak edffbc680d Fixed capitalization of most game items 2014-12-18 03:10:36 +01:00
PsiOmega efb6adb452 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-12-14 00:27:16 +01:00
Zuhayr d2803ec4d7 Merge resolution. 2014-12-13 23:10:46 +10:30
Zuhayr 7770b355dd Fixes #7404 2014-12-13 22:15:13 +10:30
PsiOmega b9ce5404d8 Fixes lab coat without icon.
Simply by changing it to the new labcoat variant that can be closed/opened.
Still created a proper definition for the old lab coat, /obj/item/clothing/suit/storage/labcoat, as it's inherited by custom gear.
2014-12-12 14:30:12 +01:00
PsiOmega cf78fe903b Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-12-12 09:04:09 +01:00
PsiOmega 18ee756ca2 Fixes broken span statement.
Adds a proper class and closer.
2014-12-11 19:05:59 +01:00
GinjaNinja32 681a6d21ea Merge remote-tracking branch 'upstream/dev' into !
Conflicts:
	code/modules/mob/hear_say.dm
2014-12-08 15:32:49 +00:00
Zuhayr 3c66bd3920 Merge resolution. 2014-12-08 13:01:04 +10:30
Zuhayr b556609e27 Replaces some macros. 2014-12-08 10:34:36 +10:30
Zuhayr dfca49c900 Fixes #7105 2014-12-08 05:14:04 +10:30
Zuhayr 1211360118 Fixes #6974 2014-12-08 05:00:54 +10:30
GinjaNinja32 6a975a1e6a Noise emotes
Conflicts:
	code/modules/mob/living/carbon/brain/say.dm
2014-12-07 12:09:02 +00:00
mwerezak 89cef05a19 Merge remote-tracking branch 'upstream/dev' into secure-airlock 2014-12-04 17:15:27 -05:00
mwerezak 58f227ec69 Cleans up airlock electronics
Removes the icon_state hack
Moves airlock electronics creation into it's own proc.
Moved airlock creation from a door assembly to airlock/New()
2014-12-04 16:40:27 -05:00
PsiOmega 52346094f8 Fixes #7214.
Dismantling a window should now return an appropriate number of sheets for its type.
2014-12-03 11:06:33 +01:00